Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge template refresh #154

Merged
merged 207 commits into from
Oct 11, 2023
Merged

Merge template refresh #154

merged 207 commits into from
Oct 11, 2023

Conversation

sjspielman
Copy link
Member

Closes #117

Homestretch! This PR merges template-refresh into main. I am filing this on a Friday, so I certainly do not expect it to be reviewed or merged today, but this does feel good to file!

For review, you'll want to explore the site serving under both "remote" and "in-person" configurations.

Noting this bit from #117 -

That said, I suppose it can't entirely hurt to, before this gets merged, tag/release the current main branch and then tag as new release after merging. That can be decided later.

It is now later 🎉 ! I still think versioning is not a terrible idea, since this is a public template. Any thoughts on this from reviewers? We'd want to reflect a major bump, so we could do -

…directory which only contained screenshots for those files that were deleted here
…ns.md has been renamed to workshop-resources.md, so there are no more relative links to the old file name
…of the main resources markdown as well as the other single cell resources file we've been using
…e the only rellink to it in HOME to match final location
…ielman/121-completed-notebooks-virtual-setup
…ng in additional-resources. Fixed typos along the way
… to dictionary, might as well just update those issue templates now which partially addresses #124
…w and fix other typoes, added to dictionary, and did CCDL -> Data Lab in code-of-conduct to fix spelling errors and partly satifify #92
sjspielman and others added 23 commits October 5, 2023 14:10
…m DESeq2 vignette since that is hard to maintain
… to something written in 2023, same lab group
…ng with its links, to software-setup-instructions.md, since really there are very few installs vs setup info.
…reenshots

Update Zoom procedures and clear out screenshots
Co-authored-by: Joshua Shapiro <josh.shapiro@ccdatalab.org>
@jashapiro
Copy link
Member

It is now later 🎉 ! I still think versioning is not a terrible idea, since this is a public template. Any thoughts on this from reviewers? We'd want to reflect a major bump, so we could do -

I think tagging by year probably makes the most sense here, rather real version numbers.

Copy link
Member

@jashapiro jashapiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I loaded and tested both versions of the website, clicking around at many but not all links, and things seemed to be fine.

Before merging this, it probably makes sense to tag the previous version: I'll leave it to you exactly how to do the tags, but as I said, I would probably favor dates over semantic versions.

@sjspielman
Copy link
Member Author

sjspielman commented Oct 11, 2023

Before merging this, it probably makes sense to tag the previous version: I'll leave it to you exactly how to do the tags, but as I said, I would probably favor dates over semantic versions.

I do like the idea of dates, but I'm not sure about using just a year. What do you think about 2023-09 (current; or really any other previous year/month combo since 2020-03!) and 2023-10 (after merge)?

@sjspielman
Copy link
Member Author

probably should have tagged you @jashapiro ☝️

@jashapiro
Copy link
Member

Before merging this, it probably makes sense to tag the previous version: I'll leave it to you exactly how to do the tags, but as I said, I would probably favor dates over semantic versions.

I do like the idea of dates, but I'm not sure about using just a year. What do you think about 2023-09 (current; or really any other previous year/month combo since 2020-03!) and 2023-10 (after merge)?

That is fine. Maybe 2020.03 for no accidental subtraction reasons?

@sjspielman sjspielman merged commit f1b4d87 into main Oct 11, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Release" the updated template
2 participants