From 267d9e772faf0e61270b18a1347b26c7f2a4db7d Mon Sep 17 00:00:00 2001 From: Cole Lyman Date: Fri, 22 Mar 2024 14:58:35 -0600 Subject: [PATCH 1/4] Update report changes --- CRISPResso2/CRISPRessoReports/README.md | 24 ++++++++++++++++--- .../templates/batchReport.html | 1 - .../templates/multiReport.html | 3 ++- .../templates/pooledReport.html | 5 ++-- .../templates/wgsReport.html | 5 ++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CRISPResso2/CRISPRessoReports/README.md b/CRISPResso2/CRISPRessoReports/README.md index b31cff80..39487ca6 100644 --- a/CRISPResso2/CRISPRessoReports/README.md +++ b/CRISPResso2/CRISPRessoReports/README.md @@ -86,10 +86,16 @@ Also, note that the default commit message may have a summary of all commits, pl 1. In the parent repo, switch to (or create) the branch on `CRISPRessoReports` that will have the changes you push. -If you are creating a new branch based off of `CRISPRessoReports` master, run this: +If you are creating a new branch based off of `CRISPRessoReports` master, run this to switch to the reports master branch: ``` shell -git checkout -b -reports reports/master +git checkout reports/master +``` + +Then, run to actually create (and switch to) the branch that you will be working with: + +``` shell +git checkout -b -reports ``` Or if you would like to push to an existing branch on `CRISPRessoReports`, run this: @@ -106,6 +112,18 @@ git merge --squash -Xsubtree="CRISPResso2/CRISPRessoReports" --no-commit --allow *Note:* `` is the branch of the parent repo that contains the changes inside the `CRISPRessoReports` sub-directory. +3. Push to `CRISPRessoReports`. + +``` shell +git push +``` + +4. Switch back to your branch on `CRISPResso` or `C2Web`. + +``` shell +git checkout +``` + ### I am working on a feature that requires changing `CRISPRessoReports`, what do I do? If a feature that you are working on requires changes to CRISPRessoReports, you will need to perform a few steps to get setup. @@ -113,7 +131,7 @@ If a feature that you are working on requires changes to CRISPRessoReports, you 1. Create a feature branch in the parent repo, based on the parent repo master. ``` shell -git checkout -b origin/master +git checkout -b ``` 2. Create a feature branch on `CRISPRessoReports`. diff --git a/CRISPResso2/CRISPRessoReports/templates/batchReport.html b/CRISPResso2/CRISPRessoReports/templates/batchReport.html index 1255424c..49a6c9ea 100644 --- a/CRISPResso2/CRISPRessoReports/templates/batchReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/batchReport.html @@ -45,7 +45,6 @@ {% endblock %} {% block content %} -
diff --git a/CRISPResso2/CRISPRessoReports/templates/multiReport.html b/CRISPResso2/CRISPRessoReports/templates/multiReport.html index 10d30063..48895792 100644 --- a/CRISPResso2/CRISPRessoReports/templates/multiReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/multiReport.html @@ -46,7 +46,7 @@ {% endblock %} {% block content %} - +
@@ -162,6 +162,7 @@
Summary Plots
{# column #}
+
{% endblock %} {% block foot %} diff --git a/CRISPResso2/CRISPRessoReports/templates/pooledReport.html b/CRISPResso2/CRISPRessoReports/templates/pooledReport.html index ba944d90..899f39c1 100644 --- a/CRISPResso2/CRISPRessoReports/templates/pooledReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/pooledReport.html @@ -44,7 +44,6 @@ {% endblock %} {% block content %} -
@@ -60,8 +59,8 @@
{{report_name}}
{% for region_name in run_names %} - {{region_name}} - {% endfor %} + {{region_name}} + {% endfor %}
diff --git a/CRISPResso2/CRISPRessoReports/templates/wgsReport.html b/CRISPResso2/CRISPRessoReports/templates/wgsReport.html index 5f2008a4..47ab9002 100644 --- a/CRISPResso2/CRISPRessoReports/templates/wgsReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/wgsReport.html @@ -45,7 +45,6 @@ {% endblock %} {% block content %} -
@@ -60,8 +59,8 @@
{{report_name}}
{% for region_name in run_names %} - {{region_name}} - {% endfor %} + {{region_name}} + {% endfor %}
From 22d28cb6bf84af741d6635d14a83c93c80274501 Mon Sep 17 00:00:00 2001 From: Cole Lyman Date: Fri, 22 Mar 2024 15:23:47 -0600 Subject: [PATCH 2/4] Switch branch of integration test repo --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index fae5a96b..96a481c7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -37,13 +37,13 @@ jobs: run: | mkdir ../CRISPResso2_copy cp -r * ../CRISPResso2_copy - + - name: Copy C2_tests repo uses: actions/checkout@master with: repository: edilytics/CRISPResso2_tests token: ${{ secrets.ACCESS_CRISPRESSO2_TESTS }} - # ref: '' // Use this to specify a branch other than master + ref: 'cole/update-reports' - name: Run Basic run: | From f0cd58e69b2a7f821842de1c0239a08c6cb3ba30 Mon Sep 17 00:00:00 2001 From: Cole Lyman Date: Fri, 22 Mar 2024 15:59:00 -0600 Subject: [PATCH 3/4] Remove extraneous `crispresso_data_path` --- CRISPResso2/CRISPRessoReports/templates/multiReport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRISPResso2/CRISPRessoReports/templates/multiReport.html b/CRISPResso2/CRISPRessoReports/templates/multiReport.html index 48895792..2831d9fc 100644 --- a/CRISPResso2/CRISPRessoReports/templates/multiReport.html +++ b/CRISPResso2/CRISPRessoReports/templates/multiReport.html @@ -61,7 +61,7 @@
{{report_name}}
{% for run_name in run_names %} - {{run_name}} + {{run_name}} {% endfor %}
From be69a6cedbad47c98088227ce1f0e0cb0bc84dc0 Mon Sep 17 00:00:00 2001 From: Cole Lyman Date: Mon, 25 Mar 2024 09:44:07 -0600 Subject: [PATCH 4/4] Point integration tests back to master --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 96a481c7..9781e036 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -43,7 +43,7 @@ jobs: with: repository: edilytics/CRISPResso2_tests token: ${{ secrets.ACCESS_CRISPRESSO2_TESTS }} - ref: 'cole/update-reports' + # ref: '' // Use this to specify a branch other than master - name: Run Basic run: |