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

Update setup text handling #194

Merged
merged 16 commits into from
Sep 12, 2024
Merged

Update setup text handling #194

merged 16 commits into from
Sep 12, 2024

Conversation

sjspielman
Copy link
Member

Stacked on #191
Closes #180

Here I'm updating how we handle the setup text (and one small part of the home page) to handle either an RRP or OpenRRP setup. I added a config variable to control that logic, and include either set up of instructions on the setup page. I also decided to set this up such that OpenRRP will show both sets of instructions, to allow for participants who only stay for the first day.

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.

Thanks for doing this! I think it looks good overall, but I would probably simplify to remove the rrp file, and just inline that text, as it is always included.

Keeping the OpenScPCA content in a separate file seems good though.

A couple other little suggestions as well

docs/_config.yaml Outdated Show resolved Hide resolved
docs/setup_instructions/setup_overview.md Outdated Show resolved Hide resolved
docs/setup_instructions/openrrp-setup.md Outdated Show resolved Hide resolved
docs/setup_instructions/openrrp-setup.md Outdated Show resolved Hide resolved
docs/setup_instructions/rrp-setup.md Outdated Show resolved Hide resolved
docs/setup_instructions/setup_overview.md Outdated Show resolved Hide resolved
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 made a few more suggestions about arrangement. But I realized that there will be a fair amount of duplication between the general instructions and the open-scpca specific instructions. Do we want to remove the parts that are duplicated, like WSL and R/RStudio from the OpenScPCA instructions? Or replace them with a reminder that "you should have already..."?

docs/setup_instructions/setup_overview.md Outdated Show resolved Hide resolved
docs/setup_instructions/setup_overview.md Show resolved Hide resolved

### Only staying for "Reproducible Research Practices"?
Copy link
Member

Choose a reason for hiding this comment

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

This may be odd for the TOC. Maybe just bold? or I am sure there is someway to exclude it from the TOC

Copy link
Member Author

Choose a reason for hiding this comment

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

probably just make it bold allejo/jekyll-toc#3


<!--
If you are only staying for the first half of the workshop and _not_ for the portion about OpenScPCA, you can follow these setup instructions.
_Otherwise, please proceed to the next section and follow all other instructions._
Copy link
Member

Choose a reason for hiding this comment

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

I think having the "next section" unspecified is probably confusing. Maybe we want ## General software requirements and ## OpenScPCA requirements which you can then refer to directly? Which might mean bumping down all of the headers in the openrrp doc?

@sjspielman sjspielman changed the base branch from sjspielman/181-update-wsl-instructions to main September 11, 2024 18:17
@sjspielman
Copy link
Member Author

But I realized that there will be a fair amount of duplication between the general instructions and the open-scpca specific instructions.

I guess I viewed them as totally separate sets of instructions under the assumption that OpenRRP participants wouldn't even follow the RRP-specific instructions in the first place. But, I can rework this so that the OpenRRP section fully complementary to RRP, such that first everyone follows RRP and then optionally one can do the rest of the OpenScPCA installs. This will also lead to reorganization: rather than having a header "only staying for RRP?", we'd end up with "also staying for OpenScPCA? do these things too."

@jashapiro
Copy link
Member

I guess I viewed them as totally separate sets of instructions under the assumption that OpenRRP participants wouldn't even follow the RRP-specific instructions in the first place. But, I can rework this so that the OpenRRP section fully complementary to RRP, such that first everyone follows RRP and then optionally one can do the rest of the OpenScPCA installs. This will also lead to reorganization: rather than having a header "only staying for RRP?", we'd end up with "also staying for OpenScPCA? do these things too."

That is what I had though we would do at first by substituting the pages entirely rather than trying to do includes. But you left the base RRP instructions there and people will encounter those first, so I would expect a large fraction of people to do them, whether or not they are doing OpenRRP.

@@ -112,6 +112,7 @@ natively
Nextflow
nonconsensual
Nüst
openrrp
Copy link
Member Author

Choose a reason for hiding this comment

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

annoyingly this is for the jekyll variable...

@sjspielman
Copy link
Member Author

I think I've gotten these consolidated now, let me know what you think!

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.

This looks good to me.

@sjspielman sjspielman merged commit 9ce0f41 into main Sep 12, 2024
1 check passed
@sjspielman sjspielman deleted the sjspielman/180-setup-text branch September 12, 2024 18:51
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.

Update setup text
2 participants