Skip to content

Commit 9e9161e

Browse files
authored
Merge pull request #226 from mskcc-omics-workflows/release/0.2.4
Release/0.2.4
2 parents 3b31965 + 9a77b24 commit 9e9161e

86 files changed

Lines changed: 3444 additions & 430 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
# Review from a member of the review-team is required
22
* @mskcc-omics-workflows/reviewers
3+
modules/msk/calculatenoise/** @mikefeixu @mskcc-omics-workflows/reviewers
34
modules/msk/custom/splitfastqbylane/** @anoronh4 @mskcc-omics-workflows/reviewers
45
modules/msk/facets/** @nikhil @mskcc-omics-workflows/reviewers
6+
modules/msk/fgbio/collectduplexseqmetrics/** @mikefeixu @mskcc-omics-workflows/reviewers
57
modules/msk/gatk4/applybqsr/** @yocra3 @FriederikeHanssen @mskcc-omics-workflows/reviewers
68
modules/msk/gbcms/** @buehlere @mskcc-omics-workflows/reviewers
9+
modules/msk/generatemutfasta/1.1/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
10+
modules/msk/generatemutfasta/1.2/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
711
modules/msk/genomenexus/annotationpipeline/** @rnaidu @mskcc-omics-workflows/reviewers
812
modules/msk/genomenexus/vcf2maf/** @rnaidu @mskcc-omics-workflows/reviewers
913
modules/msk/genotypevariants/all/** @buehlere @mskcc-omics-workflows/reviewers
14+
modules/msk/mutalyzer/normalizer/** @nikhil @mskcc-omics-workflows/reviewers
15+
modules/msk/mutalyzer/retriever/** @nikhil @mskcc-omics-workflows/reviewers
1016
modules/msk/mutect1/** @rnaidu @mskcc-omics-workflows/reviewers
1117
modules/msk/neoantigenediting/aligntoiedb/** @nikhil @mskcc-omics-workflows/reviewers
1218
modules/msk/neoantigenediting/computefitness/** @nikhil @mskcc-omics-workflows/reviewers
1319
modules/msk/neoantigenutils/convertannotjson/** @johnoooh @mskcc-omics-workflows/reviewers
1420
modules/msk/neoantigenutils/formatnetmhcpan/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
1521
modules/msk/neoantigenutils/generatehlastring/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
16-
modules/msk/neoantigenutils/generatemutfasta/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
1722
modules/msk/neoantigenutils/neoantigeninput/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
1823
modules/msk/neosv/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
1924
modules/msk/netmhc3/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
2025
modules/msk/netmhcpan4/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
2126
modules/msk/netmhcstabpan/** @johnoooh @nikhil @mskcc-omics-workflows/reviewers
27+
modules/msk/oncokb/mafannotate/** @johnoooh @mskcc-omics-workflows/reviewers
2228
modules/msk/phylowgs/createinput/** @pintoa1-mskcc @mskcc-omics-workflows/reviewers
2329
modules/msk/phylowgs/multievolve/** @nikhil @mskcc-omics-workflows/reviewers
2430
modules/msk/phylowgs/parsecnvs/** @pintoa1-mskcc @mskcc-omics-workflows/reviewers
@@ -31,6 +37,7 @@ modules/msk/rediscoverte/** @nikhil @mskcc-omics-workflows/reviewers
3137
modules/msk/salmon/index/** @nikhil @mskcc-omics-workflows/reviewers
3238
modules/msk/salmon/quant/** @nikhil @mskcc-omics-workflows/reviewers
3339
modules/msk/snppileup/** @nikhil @mskcc-omics-workflows/reviewers
40+
subworkflows/msk/generate_mutated_peptides/** @nikhil @mskcc-omics-workflows/reviewers
3441
subworkflows/msk/genome_nexus/** @rnaidu @mskcc-omics-workflows/reviewers
3542
subworkflows/msk/neoantigen_editing/** @johnoooh @mskcc-omics-workflows/reviewers
3643
subworkflows/msk/netmhcstabandpan/** @nikhil @mskcc-omics-workflows/reviewers

.github/actions/nf-test-action/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ runs:
6565
python -m pip install cryptography
6666
nextflow secrets set SENTIEON_AUTH_DATA $(python3 tests/modules/nf-core/sentieon/license_message.py encrypt --key "$SENTIEON_ENCRYPTION_KEY" --message "$SENTIEON_LICENSE_MESSAGE")
6767
68+
- name: Set up nextflow ONCOKB secrets
69+
if: env.ONCOKB_TOKEN != ''
70+
shell: bash
71+
run: |
72+
nextflow secrets set ONCOKB_TOKEN $ONCOKB_TOKEN
73+
74+
6875
# TODO Skip failing conda tests and document their failures
6976
# https://github.com/nf-core/modules/issues/7017
7077
- name: Run nf-test

.github/conda_skip.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
exclude:
22
- path: modules/msk/nf-test
3+
- profile: conda
4+
path: modules/msk/calculatenoise
35
- profile: conda
46
path: modules/msk/gbcms
57
- profile: conda
@@ -35,7 +37,9 @@ exclude:
3537
- profile: conda
3638
path: modules/msk/ppflagfixer
3739
- profile: conda
38-
path: modules/msk/neoantigenutils/generatemutfasta
40+
path: modules/msk/generatemutfasta/1.1
41+
- profile: conda
42+
path: modules/msk/generatemutfasta/1.2
3943
- profile: conda
4044
path: modules/msk/neoantigenutils/formatnetmhcpan
4145
- profile: conda
@@ -72,3 +76,9 @@ exclude:
7276
path: modules/msk/neosv
7377
- profile: conda
7478
path: modules/msk/netmhc3
79+
- profile: conda
80+
path: modules/msk/oncokb/mafannotate
81+
- profile: conda
82+
path: modules/msk/mutalyzer/normalizer
83+
- profile: conda
84+
path: modules/msk/mutalyzer/retriever

.github/skip_nf_test.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
{
22
"conda": [
3+
"modules/msk/calculatenoise",
34
"modules/msk/ppflagfixer",
45
"modules/msk/facets",
6+
"modules/msk/fgbio/collectduplexseqmetrics",
57
"modules/msk/gbcms",
68
"modules/msk/neoantigenediting/computefitness",
79
"modules/msk/neoantigenediting/aligntoiedb",
810
"modules/msk/neoantigenutils/neoantigeninput",
911
"modules/msk/neoantigenutils/convertannotjson",
10-
"modules/msk/neoantigenutils/generatemutfasta",
1112
"modules/msk/neoantigenutils/generatehlastring",
1213
"modules/msk/neoantigenutils/formatnetmhcpan",
14+
"modules/msk/generatemutfasta/1.1",
15+
"modules/msk/generatemutfasta/1.2",
1316
"modules/msk/neosv",
1417
"modules/msk/mutect1",
1518
"modules/msk/snppileup",
@@ -19,21 +22,23 @@
1922
"modules/msk/rediscoverte",
2023
"modules/msk/netmhcpan4",
2124
"modules/msk/netmhc3",
25+
"modules/msk/mutalyzer/retriever",
26+
"modules/msk/mutalyzer/normalizer",
2227
"modules/msk/genotypevariants/all",
2328
"modules/msk/phylowgs/createinput",
2429
"modules/msk/phylowgs/multievolve",
2530
"modules/msk/phylowgs/writeresults",
2631
"modules/msk/phylowgs/parsecnvs",
2732
"modules/msk/pvmaf/concat",
2833
"modules/msk/pvmaf/tagtraceback",
34+
"modules/msk/oncokb/mafannotate",
2935
"subworkflows/msk/genome_nexus",
30-
"subworkflows/msk/neoantigen_editing",
3136
"subworkflows/msk/netmhcstabandpan",
3237
"subworkflows/msk/phylowgs",
38+
"subworkflows/msk/generate_mutated_peptides",
39+
"subworkflows/msk/neoantigen_editing",
3340
"subworkflows/msk/traceback"
3441
],
35-
"docker": [
36-
],
37-
"singularity": [
38-
]
42+
"docker": [],
43+
"singularity": []
3944
}

.github/workflows/assign_codeowners.yml

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,45 @@ jobs:
1111
- name: Checkout code
1212
uses: actions/checkout@v4
1313
with:
14-
repository: ${{ github.event.pull_request.head.repo.full_name }}
15-
ref: ${{ github.event.pull_request.head.ref }}
16-
- name: Install yq
14+
token: ${{ secrets.ACTION_TOKEN }}
15+
persist-credentials: false
16+
17+
- name: Install yq and fd-find
1718
run: |
1819
sudo snap install yq
19-
sudo apt install fd-find
20+
sudo apt update
21+
sudo apt install -y fd-find
22+
# Create alias for fd-find
23+
echo "alias fd=fdfind" >> ~/.bashrc
24+
source ~/.bashrc
25+
2026
- name: Run generate_codeowners.sh
2127
run: |
2228
chmod +x .github/generate_codeowners.sh
2329
./.github/generate_codeowners.sh
30+
2431
- name: Validate codeowners file
2532
uses: mszostok/codeowners-validator@v0.7.4
2633
with:
2734
checks: "files,duppatterns,syntax"
28-
- name: Commit CODEOWNERS changes
29-
uses: EndBug/add-and-commit@v9
30-
with:
31-
add: '[".github/CODEOWNERS --force"]'
32-
message: "Update CODEOWNERS file"
33-
default_author: github_actions
34-
cwd: "./"
35+
36+
- name: Check for CODEOWNERS changes
37+
id: check_changes
38+
run: |
39+
if git diff --exit-code .github/CODEOWNERS; then
40+
echo "changed=false" >> $GITHUB_OUTPUT
41+
else
42+
echo "changed=true" >> $GITHUB_OUTPUT
43+
fi
44+
45+
- name: Commit and push changes
46+
if: steps.check_changes.outputs.changed == 'true'
47+
run: |
48+
git config user.name "github-actions[bot]"
49+
git config user.email "github-actions[bot]@users.noreply.github.com"
50+
51+
git add .github/CODEOWNERS
52+
git commit -m "update CODEOWNERS file"
53+
54+
git remote set-url origin "https://x-access-token:${{ secrets.ACTION_TOKEN }}@github.com/mskcc-omics-workflows/modules.git"
55+
git push --force-with-lease origin develop

.github/workflows/gitbook-sync.yml

Lines changed: 72 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,31 @@ jobs:
4747
fetch-depth: 2 # To retrieve the preceding commit.
4848

4949
- name: Combine all tags.yml files
50-
id: get_tags
51-
run: find . -name "tags.yml" -not -path "./.github/*" -exec cat {} + > .github/tags.yml
50+
run: |
51+
echo "{}" > .github/tags.yml
52+
53+
for f in $(find . -name "tags.yml" -not -path "./.github/*"); do
54+
if [[ "$f" == *"/modules/"* ]]; then
55+
PREFIX="modules"
56+
elif [[ "$f" == *"/subworkflows/"* ]]; then
57+
PREFIX="subworkflows"
58+
else
59+
echo "Unknown feature type for $f"
60+
exit 1
61+
fi
62+
63+
yq eval "
64+
with_entries(
65+
.key = \"${PREFIX}/\" + .key
66+
)
67+
" "$f" > /tmp/tags.prefixed.yml
68+
69+
yq eval-all '. as $item ireduce ({}; . *+ $item)' \
70+
.github/tags.yml /tmp/tags.prefixed.yml > /tmp/tags.merged.yml
71+
72+
mv /tmp/tags.merged.yml .github/tags.yml
73+
done
74+
5275
5376
- name: debug
5477
run: cat .github/tags.yml
@@ -67,6 +90,7 @@ jobs:
6790
needs: [pytest-changes, nf-test-changes]
6891
strategy:
6992
fail-fast: false
93+
max-parallel: 1
7094
matrix:
7195
tags:
7296
[
@@ -85,28 +109,52 @@ jobs:
85109
uses: actions/setup-python@v4
86110
with:
87111
python-version: "3.10" # install the python version needed
112+
- name: Install yq
113+
run: sudo apt-get update && sudo apt-get install -y yq
88114
- uses: actions/checkout@v4
89115
with:
90116
ref: docs
91117
- name: Update name of ${{ matrix.tags }}
92118
run: |
93119
MATRIX_FRAGMENT="${{ matrix.tags }}"
94120
TEMP_NAME=$(echo $MATRIX_FRAGMENT | sed 's/subworkflows\///g')
95-
SW_NAME=$(echo $TEMP_NAME | sed 's/modules\///g')
121+
SW_NAME=$(echo $TEMP_NAME | sed 's/modules\///g' | sed 's/\//\//')
96122
echo "SW_NAME=$SW_NAME" >> $GITHUB_ENV
97123
- name: Rename md file
98124
id: replace_slash
99125
run: |
100126
FRAGMENT="${{ env.SW_NAME }}"
101-
MD_NAME=$(echo $FRAGMENT | sed 's/\//_/g')
127+
if [[ "$FRAGMENT" == *"/"* ]]; then
128+
DIR="$(dirname "$FRAGMENT")"
129+
BASE="$(basename "$FRAGMENT")"
130+
MD_PATH="${DIR}/${DIR}_${BASE}"
131+
else
132+
MD_PATH="$FRAGMENT"
133+
fi
134+
135+
echo "MD_PATH=$MD_PATH" >> $GITHUB_ENV
136+
MD_NAME="${FRAGMENT}"
137+
138+
echo "MD_PATH=$MD_PATH" >> $GITHUB_ENV
102139
echo "MD_NAME=$MD_NAME" >> $GITHUB_ENV
103-
echo "${MD_NAME}"
104140
- uses: EndBug/add-and-commit@v9
105141
with:
106142
default_author: github_actions
107143
message: "pull changes before adding doc for ${{ matrix.tags }}"
108144
pull: "--rebase"
109145
cwd: "./"
146+
- name: Ensure output folder exists and debug
147+
run: |
148+
echo "MD_PATH=${MD_PATH}"
149+
echo "Creating folder: ./modules/$(dirname ${MD_PATH})"
150+
mkdir -p ./modules/$(dirname ${MD_PATH})
151+
ls -la ./modules
152+
- name: Ensure parent README exists
153+
run: |
154+
DIR="$(dirname "$MD_PATH")"
155+
if [ ! -f "./modules/$DIR/README.md" ]; then
156+
echo "# $DIR" > "./modules/$DIR/README.md"
157+
fi
110158
- name: Download convertor from yml to md
111159
run: |
112160
curl -o ${{ github.workspace }}/yaml_to_md.py https://raw.githubusercontent.com/mskcc-omics-workflows/yaml_to_md/0.0.3/yaml_to_md.py
@@ -152,24 +200,33 @@ jobs:
152200
echo "FEATURE_TYPE=$FEATURE_TYPE" >> $GITHUB_ENV
153201
echo "SUMMARY_TYPE=$SUMMARY_TYPE" >> $GITHUB_ENV
154202
echo "SUBWORKFLOW=$SUBWORKFLOW" >> $GITHUB_ENV
203+
155204
- name: Run convertor to generate md file for new module
156205
run: |
157206
echo ${{ matrix.tags }}
158-
python ${{ github.workspace }}/yaml_to_md.py all --yaml-file ${{ github.workspace }}/temp.yml --output-file ./${{ env.FEATURE_TYPE }}/${{ env.MD_NAME }}.md --schema-url https://raw.githubusercontent.com/mskcc-omics-workflows/yaml_to_md/0.0.3/nextflow_schema/${{ env.FEATURE_TYPE }}/meta-schema.json ${{ env.SUBWORKFLOW }}
159-
- name: Check file existence for modules
160-
id: check_files
161-
uses: andstor/file-existence-action@v1
162-
with:
163-
branch: docs
164-
files: ${{ env.FEATURE_TYPE}}/${{ env.MD_NAME }}.md
207+
mkdir -p ./${{ env.FEATURE_TYPE }}/$(dirname $MD_PATH)
208+
python ${{ github.workspace }}/yaml_to_md.py all \
209+
--yaml-file ${{ github.workspace }}/temp.yml \
210+
--output-file ./${{ env.FEATURE_TYPE }}/${{ env.MD_PATH }}.md \
211+
--schema-url https://raw.githubusercontent.com/mskcc-omics-workflows/yaml_to_md/0.0.3/nextflow_schema/${{ env.FEATURE_TYPE }}/meta-schema.json \
212+
${{ env.SUBWORKFLOW }}
165213
- name: Add to SUMMARY for new features
166214
run: |
167-
curl -o ${{ github.workspace }}/update_summary.py https://raw.githubusercontent.com/mskcc-omics-workflows/modules/develop/.github/workflows/update_summary.py
168-
python ${{ github.workspace }}/update_summary.py SUMMARY.md "* [${{ env.MD_NAME }}](${{ env.FEATURE_TYPE }}/${{ env.MD_NAME }}.md)" ${{ env.SUMMARY_TYPE }} > tmp_summary.md
215+
curl -o ${{ github.workspace }}/update_summary.py https://raw.githubusercontent.com/mskcc-omics-workflows/modules/release/0.2.4/.github/workflows/update_summary.py
216+
python ${{ github.workspace }}/update_summary.py SUMMARY.md "${{ env.SW_NAME }}" ${{ env.SUMMARY_TYPE }} > tmp_summary.md
169217
mv tmp_summary.md SUMMARY.md
218+
- name: Check for changes
219+
run: |
220+
if git diff --quiet; then
221+
echo "NO_CHANGES=true" >> $GITHUB_ENV
222+
fi
223+
- name: Stage new files
224+
run: |
225+
git add "./${{ env.FEATURE_TYPE }}/${{ env.MD_PATH }}.md"
226+
git add SUMMARY.md
170227
- uses: EndBug/add-and-commit@v9
171228
with:
172229
default_author: github_actions
173230
message: "add doc for ${{ matrix.tags }}"
174-
add: '["*/*.md --force", "SUMMARY.md --force"]'
175231
cwd: "./"
232+
push: --force

.github/workflows/nf-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
env:
8080
NXF_ANSI_LOG: false
8181
TOTAL_SHARDS: 5
82-
8382
steps:
8483
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
8584
with:
@@ -130,6 +129,7 @@ jobs:
130129
SENTIEON_LICENSE_MESSAGE: ${{ secrets.SENTIEON_LICENSE_MESSAGE }}
131130
SENTIEON_LICSRVR_IP: ${{ secrets.SENTIEON_LICSRVR_IP }}
132131
SENTIEON_AUTH_MECH: "GitHub Actions - token"
132+
ONCOKB_TOKEN: ${{ secrets.ONCOKB_TOKEN }}
133133
with:
134134
profile: ${{ matrix.profile }}
135135
shard: ${{ matrix.shard }}

0 commit comments

Comments
 (0)