diff --git a/.github/workflows/all-bactopia-tests.yml b/.github/workflows/all-bactopia-tests.yml deleted file mode 100644 index 3adac5d5..00000000 --- a/.github/workflows/all-bactopia-tests.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: All Bactopia Tests - -on: workflow_dispatch - -jobs: - bactopia-tests: - runs-on: self-hosted - defaults: - run: - shell: bash -l {0} - - steps: - - name: Checkout bactopia/bactopia - uses: actions/checkout@v4 - with: - path: ${{ github.run_id }}/bactopia - - - name: Setup ENV variables - run: | - echo "BACTOPIA_CI=/data/storage/bactopia-ci" >> $GITHUB_ENV - echo "BACTOPIA_CONDA=/data/storage/bactopia-ci/envs/conda" >> $GITHUB_ENV - echo "BACTOPIA_SINGULARITY=/data/storage/bactopia-ci/envs/singularity" >> $GITHUB_ENV - echo "BACTOPIA_TESTS=/data/storage/bactopia-ci/bactopia-tests/data" >> $GITHUB_ENV - echo "BACTOPIA_WORKSPACE=${GITHUB_WORKSPACE}/${{ github.run_id }}/bactopia" >> $GITHUB_ENV - echo "BACTOPIA_TMP=/data/storage/bactopia-tmp/${{ github.run_id }}" >> $GITHUB_ENV - mkdir "/data/storage/bactopia-tmp/${{ github.run_id }}" - - - name: Conda Profile - run: | - source /data/storage/bactopia-ci/miniforge/etc/profile.d/conda.sh - conda activate bactopia-ci - cd ${{ env.BACTOPIA_WORKSPACE }} - ls modules/local/bactopia | xargs -I {} -P 10 -n 1\ - bash -c 'BACTOPIA_ARGS="-profile test --condadir ${{ env.BACTOPIA_CONDA }} --test_data_dir ${{ env.BACTOPIA_TESTS }}" TMPDIR=${{ env.BACTOPIA_TMP }} \ - pytest --wt 10 --symlink --kwdof -o "testpaths=tests modules/local/bactopia" --git-aware --tag {}' - - - name: Docker Profile - run: | - source /data/storage/bactopia-ci/miniforge/etc/profile.d/conda.sh - conda activate bactopia-ci - cd ${{ env.BACTOPIA_WORKSPACE }} - ls modules/local/bactopia | xargs -I {} -P 10 -n 1\ - bash -c 'BACTOPIA_ARGS="-profile test,docker --test_data_dir ${{ env.BACTOPIA_TESTS }}" TMPDIR=${{ env.BACTOPIA_TMP }} \ - pytest --wt 10 --symlink --kwdof -o "testpaths=tests modules/local/bactopia" --git-aware --tag {}' - - - name: Singularity Profile - run: | - source /data/storage/bactopia-ci/miniforge/etc/profile.d/conda.sh - conda activate bactopia-ci - cd ${{ env.BACTOPIA_WORKSPACE }} - ls modules/local/bactopia | xargs -I {} -P 10 -n 1\ - bash -c 'BACTOPIA_ARGS="-profile test,singularity --singularity_cache ${{ env.BACTOPIA_SINGULARITY }} --test_data_dir ${{ env.BACTOPIA_TESTS }}" TMPDIR=${{ env.BACTOPIA_TMP }} \ - pytest --wt 10 --symlink --kwdof -o "testpaths=tests modules/local/bactopia" --git-aware --tag {}' - - - name: Upload logs on failure - if: failure() - uses: actions/upload-artifact@v2 - with: - name: logs-bactopia - path: | - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/log.out - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/log.err - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/.nextflow.log - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*.log - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*.err - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*.out - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*stderr.txt - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*stdout.txt - ${{ env.BACTOPIA_TMP }}/pytest_workflow_*/*/work/**/*versions.yml - - - name: Cleanup - if: always() - run: rm -rf ${GITHUB_WORKSPACE}/${{ github.run_id }} ${{ env.BACTOPIA_TMP }} diff --git a/.github/workflows/all-bactopia-tool-tests.yml b/.github/workflows/all-bactopia-tool-tests.yml index e0cf4ac3..62473b8b 100644 --- a/.github/workflows/all-bactopia-tool-tests.yml +++ b/.github/workflows/all-bactopia-tool-tests.yml @@ -1,4 +1,4 @@ -name: All Bactopia Tool Tests +name: All Bactopia Tests on: workflow_dispatch #schedule: diff --git a/CHANGELOG.md b/CHANGELOG.md index c92a5bf5..10be2cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,10 @@ description: A full list of Bactopia releases and a description of the changes. ### `Added` - Updated `bactopia-assembler` to include updated Medaka models +- profile for `arcc_hawk` - TB Profiler results are now merged with `collate` command +- sample name to plasmidfinder results +- support config files from nf-core/configs - bump program versions in modules - `abritamr`: 1.0.14 -> 1.0.17 - `bactopia-teton`: 1.0.1 -> 1.0.2 @@ -35,6 +38,11 @@ description: A full list of Bactopia releases and a description of the changes. - extra space in RGI container image name - sourmash version STDERR not parsed out - FASTQC writing to /tmp dir on HPC when non-readable +- abricate and ariba not using output subdirectory +- nextflow tower typos @iferres +- phispy not working with Bakta genbank files +- missed check of `--download_bakta` param in main workflow +- quast not working when estimated genome size is 0 ## v3.0.0 bactopia/bactopia "Black Cat and Brown Dog" - 2023/09/11 diff --git a/nextflow.config b/nextflow.config index beee60f0..d9680250 100644 --- a/nextflow.config +++ b/nextflow.config @@ -92,12 +92,13 @@ try { System.err.println("WARNING: Could not load nf-core/config profiles: ${params.custom_config_base}/nfcore_custom.config") } +// NOTE: The following section will only be needed if a bactopia specific profile is added to nf-core/configs // Load Bactopia custom profiles from different institutions. -try { - includeConfig "${params.custom_config_base}/pipeline/bactopia.config" -} catch (Exception e) { - System.err.println("WARNING: Could not load nf-core/config/bactopia profiles: ${params.custom_config_base}/pipeline/bactopia.config") -} +//try { +// includeConfig "${params.custom_config_base}/pipeline/bactopia.config" +//} catch (Exception e) { +// System.err.println("WARNING: Could not load nf-core/config/bactopia profiles: ${params.custom_config_base}/pipeline/bactopia.config") +//} includeConfig "conf/profiles.config"