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

Template issues #271

Merged
merged 6 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/python_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: python_lint
on:
push:
paths:
- '**.py'
- '**/*.py'
pull_request:
paths:
- '**.py'
- '**/*.py'

jobs:
flake8_py3:
Expand All @@ -18,7 +18,7 @@ jobs:
python-version: 3.9.x
architecture: x64
- name: Checkout PyTorch
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Install flake8
run: pip install flake8
- name: Run flake8
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Code contributions to the new version:
- Added "01" to results folder creation in assembly template.
- Some prompt answers limited to 1 character in lablog_viralrecon.
- Created lablog_mtbseq_results. [#270](https://github.com/BU-ISCIII/buisciii-tools/pull/270)
- PR #271. Closes [#235](https://github.com/BU-ISCIII/buisciii-tools/issues/235), [#228](https://github.com/BU-ISCIII/buisciii-tools/issues/228) and [#196](https://github.com/BU-ISCIII/buisciii-tools/issues/196)

### Modules

Expand Down
3 changes: 2 additions & 1 deletion bu_isciii/conf/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"'.nextflow*'",
"'*_DEL'",
"'*.R'",
"'*.py'"
"'*.py'",
"'*.sbatch"
]
},
"xtutatis_api_settings": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ echo "sed -i 's/#Uploaded_variation/ID/' ./vep/vep_annot_head.txt" >> _03_Vep_pl
# Merge vep_plugin.txt with dbNSFP_ENSG_gene_GRCh37.txt by "Gene" column, save as vep_dbNSFP.txt.
# Merge vep_dbNSFP.txt with variants.table by "ID" column, save as variants_annot_all.tab

echo "srun --partition short_idx --nodelist ideafix04 --mem 200G --time 12:00:00 --chdir ${scratch_dir} --output logs/MERGE_ALL.log --job-name MERGE_ALL Rscript Merge_All.R" >> _03_Vep_plugin_dbNSFP_parse.sh
echo "srun --partition short_idx --mem 200G --time 12:00:00 --chdir ${scratch_dir} --output logs/MERGE_ALL.log --job-name MERGE_ALL Rscript Merge_All.R" >> _03_Vep_plugin_dbNSFP_parse.sh

echo "srun --partition short_idx --time 2:00:00 --chdir ${scratch_dir} --output logs/AWK.log --job-name AWK bash ./aux_03_awk.sh &" >> _03_Vep_plugin_dbNSFP_parse.sh

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export NXF_OPTS="-Xms500M -Xmx4G"
-params-file ../../DOC/hg38_ensmbl_rnaseq.yml \\
--input samplesheet.csv \\
--outdir 01-$(date '+%Y%m%d')_rnaseq \\
--save_align_intermeds \\
--skip_markduplicates \\
--pseudo_aligner salmon \\
-resume
Expand Down