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

Dev -> Master for 1.10.0 release #159

Merged
merged 91 commits into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
d47b620
Bump pipeline version to 1.10dev
drpatelh Dec 21, 2022
1fcb249
Merge pull request #136 from drpatelh/fixes
drpatelh Dec 21, 2022
9a88c5c
Update module versions
robsyme Apr 3, 2023
ef7effc
Prettier fix
robsyme Apr 3, 2023
7885fcd
Update all nf-core subworkflows
drpatelh Apr 25, 2023
aba1d0b
Add fasterq-dump options to --split-files
drpatelh Apr 25, 2023
fff5da7
Use generic glob for output fastq files from fasterq-dump
drpatelh Apr 25, 2023
37f0a78
Update CHANGELOG
drpatelh Apr 25, 2023
0dcc5f3
Log contents of reads variable
drpatelh Apr 25, 2023
2d65303
Add more logging
drpatelh Apr 25, 2023
1867a80
Fix logic to factor for reads being a nested list
drpatelh Apr 26, 2023
399081e
Remove fastq files from channel
drpatelh Apr 26, 2023
935de8c
Revert to cloning map because adding entries returns a list
drpatelh Apr 26, 2023
aa82d89
Add full-sized data for 10x to test_full
drpatelh Apr 26, 2023
b47cab1
Re-install sratools/fasterqdump from nf-core/modules
drpatelh Apr 26, 2023
2de83c7
Merge pull request #146 from drpatelh/fixes
drpatelh Apr 26, 2023
81fa94b
Template update for nf-core/tools version 2.8
nf-core-bot Apr 28, 2023
d6125e1
fix: remove default ena meta fields to match api spec v2.0
May 2, 2023
24ff80b
feat: improve error handling for meta field validation
May 3, 2023
9e454f2
fix: update default mapping fields in schema and specify API version
May 3, 2023
f6a0d61
Merge pull request #148 from ejseqera/fixena
ejseqera May 3, 2023
7a1de69
Fix merge conflict
drpatelh May 4, 2023
b1019a5
Remove Sys.exit calls and quay.io in Docker definition from local mod…
drpatelh May 4, 2023
e762394
Run nf-core modules update to fix quay.io container definitions
drpatelh May 4, 2023
e39a54a
Make CHANGELOG more templaty
drpatelh May 5, 2023
8fa8bb5
Merge pull request #147 from nf-core/nf-core-template-merge-2.8
drpatelh May 5, 2023
b9888ea
Use ubuntu image from quay.io nf-core account
drpatelh May 5, 2023
c0afa08
Add #85 to CHANGELOG
drpatelh May 6, 2023
2aca881
Fix #129
drpatelh May 6, 2023
bc4edf6
Fix prettier
drpatelh May 6, 2023
1dfe97b
Merge pull request #149 from drpatelh/fixes
drpatelh May 6, 2023
b6b4394
Add multi-cloud CI for full-sized tests
drpatelh May 6, 2023
9e112c1
Remove old AWS CI tests
drpatelh May 6, 2023
7d858a3
Update CHANGELOG
drpatelh May 6, 2023
eaecac8
feat: add support for jwt as input file
ejseqera May 8, 2023
b711050
refactor: simplify logic for params.dbgap_key
May 8, 2023
acf5ed9
chore(nextflow_schema.json): update schema with dbgap_key param
ejseqera May 8, 2023
a563635
docs(usage.md): add usage detail on providing jwt file
ejseqera May 8, 2023
e90a023
Merge pull request #150 from drpatelh/fixes
drpatelh May 8, 2023
87b2bd8
chore: update changelog
ejseqera May 9, 2023
1265a8f
fix: update gse resolver to use esearch api endpoint
ejseqera May 10, 2023
0bdeac4
feat: add support for GSE/GDS IDs and resolver to GSM then SRA
ejseqera May 10, 2023
0c226d2
fix: remove support for bioproject ID (doesn't work)
ejseqera May 10, 2023
bd540c0
Update nextflow_schema.json
sirclockalot May 10, 2023
a17861a
Set a default docker registry outside of profile scope.
robsyme May 10, 2023
3fdb879
chore: update docs to support GEO IDs, remove error handling for GEO
ejseqera May 10, 2023
d19e7f4
chore: update changelog
ejseqera May 10, 2023
2db65cc
docs: update usage.md with dbGAP download details
ejseqera May 11, 2023
b2c3d5b
Update nextflow.config
drpatelh May 11, 2023
b80afbb
Update nextflow.config
maxulysse May 11, 2023
ab52d70
Merge branch 'dev' into patch-1
drpatelh May 11, 2023
717c09b
Merge pull request #156 from robsyme/docker-registry-config-move
drpatelh May 11, 2023
ffc3622
Merge pull request #153 from sirclockalot/patch-1
drpatelh May 11, 2023
aa1a535
Merge branch 'dev' into dbgap
drpatelh May 11, 2023
37d0a03
chore: apply linting for black and prettier
ejseqera May 11, 2023
92af468
chore: prettier linting
ejseqera May 11, 2023
21f3707
chore: lint docs and usage
ejseqera May 11, 2023
0cb7922
Remove quay.io prefix from mulled containers
drpatelh May 13, 2023
69d33d2
Merge branch 'dev' of https://github.com/nf-core/fetchngs into fixes
drpatelh May 13, 2023
c5839ca
Add public_aws_ecr.config and use in CI tests
drpatelh May 13, 2023
6a47ccd
Update CHANGELOG
drpatelh May 13, 2023
3e558a6
Run nf-core modules update to fix quay.io container definitions
drpatelh May 13, 2023
c9afc5c
Fix ECLint
drpatelh May 13, 2023
64a4971
Update CHANGELOG
drpatelh May 14, 2023
740b2ce
Bump pipeline version to 1.10.0
drpatelh May 14, 2023
f510057
Add ubuntu containers to public_aws_ecr.config
drpatelh May 14, 2023
719dde4
Merge pull request #157 from drpatelh/fixes
drpatelh May 15, 2023
3eb8afb
Update nextflow_schema.json
ejseqera May 15, 2023
2f23acb
Merge branch 'dbgap' of https://github.com/ejseqera/fetchngs into dbgap
ejseqera May 15, 2023
fb7b605
feat: move dbgap key param as input into parent workflow
ejseqera May 15, 2023
43400b1
Update docs/usage.md
ejseqera May 15, 2023
d74d056
docs: update changelog to reference dbgap issue and not PR
ejseqera May 15, 2023
88e45d6
Merge branch 'dbgap' of https://github.com/ejseqera/fetchngs into dbgap
ejseqera May 15, 2023
b07ca42
refactor: fix changelog to reference geo issue
ejseqera May 15, 2023
b368161
refactor: move up issue reference for dbgap
ejseqera May 15, 2023
32796fe
fix: modules update for sratools prefetch and fasterqdump
ejseqera May 15, 2023
503d0f3
Merge branch 'dev' into dbgap
ejseqera May 15, 2023
1d75d18
Apply suggestions from code review
drpatelh May 15, 2023
b641a7a
docs: add SRA example for dbgap data download with jwt
ejseqera May 15, 2023
76ad4b7
docs: update test JWT sra accession ID to experiment ID
ejseqera May 15, 2023
b0d32c2
Update workflows/sra.nf
ejseqera May 15, 2023
1dbc8bf
Merge pull request #152 from ejseqera/dbgap
drpatelh May 15, 2023
e84521d
feat: add backoff strategy and handling for API responses
ejseqera May 16, 2023
945d870
docs: update changelog
ejseqera May 16, 2023
dc72345
Merge branch 'dev' into geoids
ejseqera May 16, 2023
7a5417d
Merge pull request #155 from ejseqera/geoids
drpatelh May 16, 2023
6eeddae
fix:
adamrtalbot May 16, 2023
7518285
Additional container image
adamrtalbot May 16, 2023
c1bb214
Explicit container images per process
adamrtalbot May 16, 2023
255190e
fixup
adamrtalbot May 16, 2023
1b9d187
Merge pull request #160 from nf-core/fix_sra_ftp_aws_public_container
drpatelh May 16, 2023
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trim_trailing_whitespace = true
indent_size = 4
indent_style = space

[*.{md,yml,yaml,html,css,scss,js,cff}]
[*.{md,yml,yaml,html,css,scss,js}]
indent_size = 2

# These files are edited and tested upstream in nf-core/modules
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ body:
* Nextflow version _(eg. 22.10.1)_
* Hardware _(eg. HPC, Desktop, Cloud)_
* Executor _(eg. slurm, local, awsbatch)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter or Charliecloud)_
* Container engine: _(e.g. Docker, Singularity, Conda, Podman, Shifter, Charliecloud, or Apptainer)_
* OS _(eg. CentOS Linux, macOS, Linux Mint)_
* Version of nf-core/fetchngs _(eg. 1.1, 1.5, 1.8.2)_
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/fetc

- [ ] This comment contains a description of changes (with reason).
- [ ] If you've fixed a bug or added code that should be tested, add tests!
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/fetchngs/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/fetchngs _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/fetchngs/tree/master/.github/CONTRIBUTING.md)
- [ ] If necessary, also make a PR on the nf-core/fetchngs _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
- [ ] Make sure your code lints (`nf-core lint`).
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
- [ ] Usage Documentation in `docs/usage.md` is updated.
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/awsfulltest.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/awstest.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Check PRs
if: github.repository == 'nf-core/fetchngs'
run: |
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/fetchngs ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/fetchngs ]] && [[ $GITHUB_HEAD_REF == "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]

# If the above check failed, post a comment on the PR explaining the failure
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/clean-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Close user-tagged issues and PRs"
on:
schedule:
- cron: "0 0 * * 0" # Once a week

jobs:
clean-up:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v7
with:
stale-issue-message: "This issue has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment otherwise this issue will be closed in 20 days."
stale-pr-message: "This PR has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor. Remove stale label or add a comment if it is still useful."
close-issue-message: "This issue was closed because it has been tagged as awaiting-changes or awaiting-feedback by an nf-core contributor and then staled for 20 days with no activity."
days-before-stale: 30
days-before-close: 20
days-before-pr-close: -1
any-of-labels: "awaiting-changes,awaiting-feedback"
exempt-issue-labels: "WIP"
exempt-pr-labels: "WIP"
repo-token: "${{ secrets.GITHUB_TOKEN }}"
81 changes: 81 additions & 0 deletions .github/workflows/cloud_tests_full.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: full-sized tests on cloud providers
drpatelh marked this conversation as resolved.
Show resolved Hide resolved
run-name: Submitting workflow to all cloud providers using full sized data
on:
release:
types: [published]
workflow_dispatch:
inputs:
platform:
description: "Platform to run test"
required: true
default: "all"
type: choice
options:
- all
- aws
- azure
- gcp
jobs:
run-full-tests-on-aws:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' || !github.event.inputs }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_AWS_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/fetchngs/work-${{ github.sha }}"
run_name: "aws_fetchngs_full"
profiles: test_full,public_aws_ecr
parameters: |
{
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
"outdir": "${{ secrets.TOWER_BUCKET_AWS }}/fetchngs/results-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
run-full-tests-on-gcp:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'gcp' || !github.event.inputs }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_GCP_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_GCP }}/work/fetchngs/work-${{ github.sha }}"
run_name: "gcp_fetchngs_full"
profiles: test_full
parameters: |
{
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
"outdir": "${{ secrets.TOWER_BUCKET_GCP }}/fetchngs/results-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
run-full-tests-on-azure:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'azure' || !github.event.inputs }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_AZURE_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_AZURE }}/work/fetchngs/work-${{ github.sha }}"
run_name: "azure_fetchngs_full"
profiles: test_full
parameters: |
{
"hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
"outdir": "${{ secrets.TOWER_BUCKET_AZURE }}/fetchngs/results-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
76 changes: 76 additions & 0 deletions .github/workflows/cloud_tests_small.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: small-sized tests on cloud providers
run-name: Submitting workflow to all cloud providers using small sized data
on:
workflow_dispatch:
inputs:
platform:
description: "Platform to run test"
required: true
default: "all"
type: choice
options:
- all
- aws
- azure
- gcp
jobs:
run-small-tests-on-aws:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'aws' }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_AWS_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_AWS }}/work/fetchngs/work-${{ github.sha }}"
run_name: "aws_fetchngs_small"
profiles: test,public_aws_ecr
parameters: |
{
"outdir": "${{ secrets.TOWER_BUCKET_AWS }}/fetchngs/results-test-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
run-small-tests-on-gcp:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'gcp' }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_GCP_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_GCP }}/work/fetchngs/work-${{ github.sha }}"
run_name: "gcp_fetchngs_small"
profiles: test
parameters: |
{
"outdir": "${{ secrets.TOWER_BUCKET_GCP }}/fetchngs/results-test-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
run-small-tests-on-azure:
if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'azure' }}
runs-on: ubuntu-latest
steps:
- uses: seqeralabs/action-tower-launch@v1
with:
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
compute_env: ${{ secrets.TOWER_CE_AZURE_CPU }}
workdir: "${{ secrets.TOWER_BUCKET_AZURE }}/work/fetchngs/work-${{ github.sha }}"
run_name: "azure_fetchngs_small"
profiles: test
parameters: |
{
"outdir": "${{ secrets.TOWER_BUCKET_AZURE }}/fetchngs/results-test-${{ github.sha }}"
}
- uses: actions/upload-artifact@v3
with:
name: Tower debug log file
path: tower_action_*.log
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: "3.7"
python-version: "3.8"
architecture: "x64"

- name: Install dependencies
Expand Down
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v2.7.1"
hooks:
- id: prettier
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,46 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [[1.10.0](https://github.com/nf-core/fetchngs/releases/tag/1.10.0)] - 2023-05-16

### Credits

Special thanks to the following for their contributions to the release:

- [Adam Talbot](https://github.com/adamrtalbot)
- [Esha Joshi](https://github.com/ejseqera)
- [Maxime Garcia](https://github.com/maxulysse)
- [Moritz E. Beber](https://github.com/Midnighter)
- [Rob Syme](https://github.com/robsyme)
- [sirclockalot](https://github.com/sirclockalot)

Thank you to everyone else that has contributed by reporting bugs, enhancements or in any other way, shape or form.

### Enhancements & fixes

- [#85](https://github.com/nf-core/fetchngs/issues/85) - Not able to fetch metadata for ERR ids associated with ArrayExpress
- [#104](https://github.com/nf-core/fetchngs/issues/104) - Add support back in for [GEO IDs](https://www.ncbi.nlm.nih.gov/geo) (removed in v1.7)
- [#129](https://github.com/nf-core/fetchngs/issues/129) - Pipeline is working with SRA run ids but failing with corresponding Biosample ids
- [#138](https://github.com/nf-core/fetchngs/issues/138) - Add support for downloading protected dbGAP data using a JWT file
- [#144](https://github.com/nf-core/fetchngs/issues/144) - Add support to download 10X Genomics data
- [PR #140](https://github.com/nf-core/fetchngs/pull/140) - Bumped modules version to allow for sratools download of sralite format files
- [PR #147](https://github.com/nf-core/fetchngs/pull/147) - Updated pipeline template to [nf-core/tools 2.8](https://github.com/nf-core/tools/releases/tag/2.8)
- [PR #148](https://github.com/nf-core/fetchngs/pull/148) - Fix default metadata fields for ENA API v2.0
- [PR #150](https://github.com/nf-core/fetchngs/pull/150) - Add infrastructure and CI for multi-cloud full-sized tests run via Nextflow Tower
- [PR #157](https://github.com/nf-core/fetchngs/pull/157) - Add `public_aws_ecr.config` to source mulled containers when using `public.ecr.aws` Docker Biocontainer registry

### Software dependencies

| Dependency | Old version | New version |
| --------------- | ----------- | ----------- |
| `synapseclient` | 2.6.0 | 2.7.1 |

> **NB:** Dependency has been **updated** if both old and new version information is present.
>
> **NB:** Dependency has been **added** if just the new version information is present.
>
> **NB:** Dependency has been **removed** if new version information isn't present.

## [[1.9](https://github.com/nf-core/fetchngs/releases/tag/1.9)] - 2022-12-21

### Enhancements & fixes
Expand Down
Loading