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

Publish 3 new examples (and some other changes) #383

Closed
wants to merge 58 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
02e55c2
Adding in some style with css
cansavvy Oct 7, 2020
9e70344
Use css magic
cansavvy Oct 7, 2020
a7aad2f
Try making the navbar blue
cansavvy Oct 7, 2020
3927752
Add survey link
cansavvy Oct 15, 2020
8d7b8e2
Make font smaller
cansavvy Oct 15, 2020
d3acd2f
Merge branch 'master' into cansavvy/refinebio-fashion
cansavvy Oct 15, 2020
b0ced0f
Need a comma
cansavvy Oct 15, 2020
a7a17cd
Merge branch 'master' into cansavvy/refinebio-fashion
cansavvy Oct 16, 2020
de9726b
Change to normalizePath
cansavvy Oct 19, 2020
6928056
normalizepath separate step references.bib
cansavvy Oct 19, 2020
4c07c28
Move references.bib to component folder
cansavvy Oct 19, 2020
fa14538
Update github actions to reflect staging branch (#311)
cansavvy Oct 21, 2020
4ab1d80
Add google analytics to renderings (#314)
cansavvy Oct 21, 2020
de3dccc
Merge branch 'master' into staging
cansavvy Oct 21, 2020
1f2546c
Only push if we are in master.
jashapiro Oct 21, 2020
7d7ecc1
Add test target
jashapiro Oct 21, 2020
b96130e
test staging workflow with this branch
jashapiro Oct 21, 2020
a0640eb
back to latest tag
jashapiro Oct 21, 2020
8afc962
Try separate push step
jashapiro Oct 21, 2020
6a38574
change tags to test push
jashapiro Oct 21, 2020
f71bccc
Revert "change tags to test push"
jashapiro Oct 21, 2020
9de0042
Remove this branch from triggers
jashapiro Oct 21, 2020
28e72ef
Push staging, retag and push master
jashapiro Oct 22, 2020
a660e89
Made ccs modifications, added logo file
dvenprasad Oct 22, 2020
a24971a
Merge remote-tracking branch 'origin/master' into cansavvy/refinebio-…
cansavvy Oct 22, 2020
c6158e8
Resolve render-notebooks.R conflict
cansavvy Oct 22, 2020
145fd98
Remove testing html from file diff
cansavvy Oct 22, 2020
43b9ea7
uncommented mobile nav
dvenprasad Oct 22, 2020
b055f63
Merge pull request #321 from AlexsLemonade/jashapiro/dont-push-stagin…
jashapiro Oct 22, 2020
ca85ee0
Merge branch 'staging' into cansavvy/refinebio-fashion
cansavvy Oct 22, 2020
b1644c2
Update scripts/render-notebooks.R
jashapiro Oct 22, 2020
d87fce8
Merge pull request #325 from AlexsLemonade/cansavvy/refinebio-fashion
jashapiro Oct 22, 2020
6e57f15
Add some issue templates (#319)
cansavvy Oct 22, 2020
e56e60d
Update diagrams showing how microarray/RNA-seq work (#326)
cbethell Oct 22, 2020
36b81e8
Adding basic footer (#307)
cansavvy Oct 23, 2020
9a0474c
Updating CONTRIBUTING.md with instructions about staging -> master se…
cansavvy Oct 27, 2020
718de40
New PR templates to help with new process (#334)
cansavvy Oct 27, 2020
93c6c65
Try a "main PR" strategy with links to the real PR templates (#337)
cansavvy Oct 29, 2020
033f0cd
Add contributing diagrams (#333)
cansavvy Oct 29, 2020
70e58bb
Make the "Other" PR template the default (#341)
cansavvy Oct 29, 2020
01771e8
Add timeline reminder to issue template (#342)
cansavvy Oct 29, 2020
489cc04
Pr 1 of 2: Add Microarray Pathway Analysis - GSEA example (#345)
cbethell Nov 6, 2020
05a68f7
Pr 2 of 2: Add Microarray Pathway Analysis - GSEA example (#347)
cbethell Nov 16, 2020
936025b
Delete intro Rmd and renumber (#355)
cansavvy Nov 16, 2020
0f6a663
Add words about Draft and Refined PRs to CONTRIBUTING.md (#361)
cansavvy Nov 19, 2020
6e8579f
WGCNA Part 1: Set up (#358)
cansavvy Nov 19, 2020
4d82d89
WGCNA Part 2: Running WGCNA (#360)
cansavvy Nov 20, 2020
114d6fe
Add pathway analysis intro paragraph to microarray ORA (#356)
cansavvy Nov 20, 2020
ba7e18c
Fix WGCNA installation (#366)
jashapiro Nov 20, 2020
d6cfc8a
Pr 1 of 2: Add Microarray Pathway Analysis - GSVA example (#359)
cbethell Nov 20, 2020
2fc9de2
WGCNA Part 3: DE and heatmaps (#363)
cansavvy Nov 23, 2020
2658508
WGCNA Part 4: Warn about Outliers (#364)
cansavvy Nov 24, 2020
ae9aea8
Microarray ORA Restructure Instruction (#377)
cansavvy Nov 25, 2020
3a2f92e
WGCNA Part 5: switch dataset (#379)
cansavvy Nov 25, 2020
2dd6738
Change pdf -> png and rereun (#382)
cansavvy Nov 30, 2020
7c7555a
Pr 2 of 2: Add Microarray Pathway Analysis - GSVA example (#362)
cbethell Nov 30, 2020
666d76d
Merge branch 'staging' into publish-3-new-examples
cansavvy Dec 1, 2020
55ed758
Remove zip file that we don't need published
cansavvy Dec 1, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/ISSUE_TEMPLATE/other-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ assignees: ''
### Background

<!-- What was the background and context that lead to this problem? -->
<!-- Links to github comments or related issues are also helpful -->
<!-- Links to github comments or related issues are also helpful -->

### Problem

<!-- Why does the current state of things not work?-->

#### What potential "gotchas" do we know of?
### What potential "gotchas" do we know of?

<!-- Are there any potentially tricky things or unknowns that the person who takes on this issue should know? -->

Expand All @@ -23,4 +23,11 @@ assignees: ''
<!-- If applicable, what steps would you need to take to get started? -->

<!-- What other info is needed to complete this task (in however long an interval after the issue is written) -->

<!-- Do you have helpful references and resources we should consult? -->

### Is there a particular timeframe for this issue?

<!-- Is there a particular timeframe that a strategy decision should be made about this issue? -->

<!-- Is there a particular timeframe that this issue should be acted upon? -->
47 changes: 26 additions & 21 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
## Purpose:
What issue(s) does your PR address?

## Strategy
What was your strategy for this new or edited analysis?
## Use the 'Preview' view to click on a link below to choose an appropriate PR template:

## Concerns/Questions for reviewers:
What things should reviewers look out for?
For any stage of adding a new analysis example:
<a href="?expand=1&template=new-analysis-pr.md"> New analysis PR </a>

## Analysis Pull Request Check List (roughly in order):
For publishing changes to Github pages:
<a href="?expand=1&template=publish-pr.md"> Publishing PR </a>

### Content checks
* [ ] All `{{BLANKS}}` have been replaced with the correct content.
* [ ] [Sources are cited](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#citing-sources-in-text)
* [ ] Seed is set (if applicable)
For either stage of a hotfix PR -- something that is straightforward and needs to be user-facing quickly:
<a href="?expand=1&template=hotfix-pr.md"> Hotfix PR </a>

### Formatting Checks
* [ ] Removed any manual numbering of sections.
* [ ] Removed any instances of chunk naming.
* [ ] Comments and documentation are up to date.
* [ ] All links have been checked and are properly formatted.
## For any other types of PRs that don't fit any of the above categories, delete the previous section (including this line) and use the template below.

### Add datasets to S3
* [ ] Added [data and metadata files to S3](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#adding-datasets-to-the-S3-bucket).
### Purpose

### Docker/Snakemake rendering components
* [ ] Added the `.html` [link to the navigation bar](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#add-new-analyses-to-the-navbar).
* [ ] Any not yet added packages needed for this analysis have been added to the Dockerfile and it successfully builds.
<!-- What was the background and context that lead to this problem? -->

<!-- Link to Github comments or related issues that are helpful -->

### Issue addressed

<!-- What is the Github issue being addressed here -->

#### Gotchas the reviewer should know about

<!-- Are there things that came up during development that you found tricky or that the reviewer should be informed about -->

## Remaining concerns and questions

<!-- Are there any outstanding issues you have questions about -->

<!-- Are there follow-up issues that should be filed? -- perhaps related issues but outside the scope of this PR -->
23 changes: 23 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/hotfix-pr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Hotfix Purpose

<!-- What is the urgent and straightforward problem that requires hotfix; why is a hotfix needed? -->

## Pull Request Stage

<!-- Select one of these and delete the other to let the reviewer know what stage this analysis example is at -->

This is the **first PR**, to `master` -- it has not been reviewed at all.

This is the **second PR**, to `staging` -- it was reviewed for the `master` branch on <!--PR Link--> and now should be reviewed mostly for correct merge conflict resolutions.

## Explain the Fix

<!-- What have you done to test that your hotfix works and addresses the problem at hand? -->

<!-- Attach any relevant screenshots or html's that show the before and after -->

## Comments/Questions for the Reviewer

<!-- Is there anything you are unsure about with this fix that you could use the reviewer's help double checking? -->

<!-- Are there follow-up issues that should be filed? -- perhaps related issues but not meant to be addressed through hotfix -->
47 changes: 47 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/new-analysis-pr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
## Analysis Purpose

<!-- What new analysis issue(s) does your PR address? -->

## Pull Request Stage

<!-- Select one of these and delete the other to let the reviewer know what stage this analysis example is at -->

This is a **Draft PR** - needs review of big concepts and outline

This is a **Refined PR** - needs review of details and polishing

<!-- In the case of the Refined PR, link the draft PR here -->

## Strategy

<!-- What was your strategy for this new or edited analysis? -->

<!-- Is there anything you found out in implementation that required you to shift strategies from what was originally discussed? -->

## Concerns/Questions for reviewers:

<!-- Are there any items you would like the reviewer to take an extra close look? -->

<!-- Any results that don't quite make sense? -->

<!-- Anywhere that you are unsure about wording or how to guide the user? -->

## Analysis Pull Request Check List (roughly in order):

### Content checks
* [ ] All `{{BLANKS}}` have been replaced with the correct content.
* [ ] [Sources are cited](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#citing-sources-in-text)
* [ ] Seed is set (if applicable)

### Formatting Checks
* [ ] Removed any manual numbering of sections.
* [ ] Removed any instances of chunk naming.
* [ ] Comments and documentation are up to date.
* [ ] All links have been checked and are properly formatted.

### Add datasets to S3
* [ ] Added [data and metadata files to S3](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#adding-datasets-to-the-S3-bucket).

### Docker/Snakemake rendering components
* [ ] Added the `.html` [link to the navigation bar](https://github.com/AlexsLemonade/refinebio-examples/blob/master/CONTRIBUTING.md#add-new-analyses-to-the-navbar).
* [ ] Any not yet added packages needed for this analysis have been added to the Dockerfile and it successfully builds.
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/publish-pr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Changes Being Published

<!-- What overall changes are being included in this "Publish" PR and are they all ready to be published? -->

## List of Commits/PR's Included

<!-- List the staging commits/PR #'s that are included with a general and quick summary of what each does -- start by finishing the prompt below -->

- PR# Added such and such

## Link to html Preview

For reviewing purposes, you can take a browse through htmlpreview: http://htmlpreview.github.io/?https://github.com/AlexsLemonade/refinebio-examples/gh-pages-stages/01-getting-started/getting-started.html

## Publishing Checklist:

- [ ] Does everything look good using html preview -- having taken a particularly close look at any new html files?

- [ ] Have any new examples been added to the [refinebio-examples feedback survey](https://app.hubspot.com/forms/5187852/a50f293c-1ef4-4ee1-b7ee-c563afe2ad5c/performance)? Ideally, don't click publish until this PR is merged (changes are autosaved).
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ _site

# If spell check is run, we don't really have a need for tracking this
spell_check_results.tsv

# If git commit history is saved to file, ignore it
git.log
31 changes: 0 additions & 31 deletions 02-microarray/pathway-analysis_microarray_00_intro.Rmd

This file was deleted.

Loading