Skip to content

Commit 9ab896c

Browse files
authored
Merge pull request #2440 from nf-core/dev
Dev -> Master for v2.10
2 parents e5ce6ce + 314aa0b commit 9ab896c

File tree

141 files changed

+5304
-2774
lines changed

Some content is hidden

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

141 files changed

+5304
-2774
lines changed

.devcontainer/devcontainer.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"image": "nfcore/gitpod:latest",
44
"postCreateCommand": "python -m pip install --upgrade -r ../requirements-dev.txt -e ../ && pre-commit install --install-hooks",
55
"remoteUser": "gitpod",
6+
"runArgs": ["--privileged"],
67

78
// Configure tool-specific properties.
89
"customizations": {

.github/RELEASE_CHECKLIST.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
1. Check issue milestones to see outstanding issues to resolve if possible or transfer to the milestones for the next release e.g. [`v1.9`](https://github.com/nf-core/tools/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.9)
44
2. Most importantly, pick an undeniably outstanding [name](http://www.codenamegenerator.com/) for the release where _Prefix_ = _Metal_ and _Dictionary_ = _Animal_.
55
3. Check the [pipeline health page](https://nf-co.re/pipeline_health) to make sure that all repos look sane (missing `TEMPLATE` branches etc)
6-
4. Create a PR to `dev` to bump the version in `CHANGELOG.md` and `setup.py` and change the gitpod container to `nfcore/gitpod:latest`.
7-
5. Make sure all CI tests are passing!
8-
6. Create a PR from `dev` to `master`
9-
7. Make sure all CI tests are passing again (additional tests are run on PRs to `master`)
10-
8. Request review (2 approvals required)
11-
9. Run `rich-codex` to regenerate docs screengrabs (actions `workflow_dispatch` button)
12-
10. Merge the PR into `master`
13-
11. Wait for CI tests on the commit to passed
14-
12. (Optional but a good idea) Run a manual sync on `nf-core/testpipeline` and check that CI is passing on the resulting PR.
15-
13. Create a new release copying the `CHANGELOG` for that release into the description section.
6+
4. Check that modules/subworkflows in tempalte are up to date with the latest releases
7+
5. Create a PR to `dev` to bump the version in `CHANGELOG.md` and `setup.py` and change the gitpod container to `nfcore/gitpod:latest`.
8+
6. Make sure all CI tests are passing!
9+
7. Create a PR from `dev` to `master`
10+
8. Make sure all CI tests are passing again (additional tests are run on PRs to `master`)
11+
9. Request review (2 approvals required)
12+
10. Run `rich-codex` to regenerate docs screengrabs (actions `workflow_dispatch` button)
13+
11. Merge the PR into `master`
14+
12. Wait for CI tests on the commit to passed
15+
13. (Optional but a good idea) Run a manual sync on `nf-core/testpipeline` and check that CI is passing on the resulting PR.
16+
14. Create a new release copying the `CHANGELOG` for that release into the description section.
1617

1718
## After release
1819

.github/workflows/create-lint-wf.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
name: Check out source-code repository
3232

3333
# Set up nf-core/tools
34-
- name: Set up Python 3.8
34+
- name: Set up Python 3.11
3535
uses: actions/setup-python@v4
3636
with:
37-
python-version: 3.8
37+
python-version: 3.11
3838

3939
- name: Install python dependencies
4040
run: |

.github/workflows/create-test-lint-wf-template.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
- uses: actions/checkout@v3
3636
name: Check out source-code repository
3737

38-
- name: Set up Python 3.8
38+
- name: Set up Python 3.11
3939
uses: actions/setup-python@v4
4040
with:
41-
python-version: 3.8
41+
python-version: 3.11
4242

4343
- name: Install python dependencies
4444
run: |
@@ -97,7 +97,7 @@ jobs:
9797
9898
# Try syncing it before we change anything
9999
- name: nf-core sync
100-
run: nf-core --log-file log.txt sync --dir my-prefix-testpipeline/ --template-yaml ${{ matrix.TEMPLATE }}
100+
run: nf-core --log-file log.txt sync --dir my-prefix-testpipeline/
101101

102102
# Run code style linting
103103
- name: Run Prettier --check

.github/workflows/create-test-wf.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
- uses: actions/checkout@v3
3030
name: Check out source-code repository
3131

32-
- name: Set up Python 3.8
32+
- name: Set up Python 3.11
3333
uses: actions/setup-python@v4
3434
with:
35-
python-version: 3.8
35+
python-version: 3.11
3636

3737
- name: Install python dependencies
3838
run: |

.github/workflows/deploy-pypi.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
- uses: actions/checkout@v3
1717
name: Check out source-code repository
1818

19-
- name: Set up Python 3.8
19+
- name: Set up Python 3.11
2020
uses: actions/setup-python@v4
2121
with:
22-
python-version: 3.8
22+
python-version: 3.11
2323

2424
- name: Install python dependencies
2525
run: |

.github/workflows/fix-linting.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
# Override to remove the default --check flag so that we make changes
3939
options: "--color"
4040

41-
- name: Set up Python 3.8
41+
- name: Set up Python 3.11
4242
uses: actions/setup-python@v4
4343
with:
44-
python-version: 3.8
44+
python-version: 3.11
4545
- name: python-isort
4646
uses: isort/[email protected]
4747
with:

.github/workflows/lint-code.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ jobs:
7676
- name: Check out source-code repository
7777
uses: actions/checkout@v3
7878

79-
- name: Set up Python 3.8
79+
- name: Set up Python 3.11
8080
uses: actions/setup-python@v4
8181
with:
82-
python-version: 3.8
82+
python-version: 3.11
8383
- name: python-isort
8484
uses: isort/[email protected]
8585
with:

.github/workflows/pytest-frozen-ubuntu-20.04.yml

-53
This file was deleted.

.github/workflows/pytest.yml

+23-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ on:
55
push:
66
branches:
77
- dev
8+
paths-ignore:
9+
- "docs/**"
10+
- "CHANGELOG.md"
811
pull_request:
12+
paths-ignore:
13+
- "docs/**"
14+
- "CHANGELOG.md"
915
release:
1016
types: [published]
1117

@@ -14,12 +20,19 @@ concurrency:
1420
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1521
cancel-in-progress: true
1622

23+
env:
24+
GITHUB_TOKEN: ${{ github.token }}
25+
1726
jobs:
1827
pytest:
19-
runs-on: ubuntu-latest
28+
runs-on: ${{ matrix.runner }}
2029
strategy:
2130
matrix:
22-
python-version: ["3.8", "3.9", "3.10", "3.11"]
31+
python-version: ["3.8", "3.11"]
32+
runner: ["ubuntu-latest"]
33+
include:
34+
- runner: "ubuntu-20.04"
35+
python-version: "3.8"
2336

2437
steps:
2538
- uses: actions/checkout@v3
@@ -35,6 +48,14 @@ jobs:
3548
python -m pip install --upgrade pip -r requirements-dev.txt
3649
pip install -e .
3750
51+
- name: Downgrade git to the Ubuntu official repository's version
52+
if: ${{ matrix.runner == 'ubuntu-20.04' && matrix.python-version == '3.8' }}
53+
run: |
54+
sudo apt update
55+
sudo apt remove git git-man
56+
sudo add-apt-repository --remove ppa:git-core/ppa
57+
sudo apt install git
58+
3859
- name: Install Nextflow
3960
uses: nf-core/setup-nextflow@v1
4061
with:

.github/workflows/sync.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
path: nf-core/${{ matrix.pipeline }}
4949
fetch-depth: "0"
5050

51-
- name: Set up Python 3.8
51+
- name: Set up Python 3.11
5252
uses: actions/setup-python@v4
5353
with:
54-
python-version: 3.8
54+
python-version: 3.11
5555

5656
- name: Install python dependencies
5757
run: |

.github/workflows/tools-api-docs-dev.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ on:
44
push:
55
branches:
66
- dev
7+
paths-ignore:
8+
- "CHANGELOG.md"
79
pull_request:
10+
paths-ignore:
11+
- "CHANGELOG.md"
812
release:
913
types: [published]
1014

@@ -22,10 +26,10 @@ jobs:
2226
- name: Check out source-code repository
2327
uses: actions/checkout@v3
2428

25-
- name: Set up Python 3.8
29+
- name: Set up Python 3.11
2630
uses: actions/setup-python@v4
2731
with:
28-
python-version: 3.8
32+
python-version: 3.11
2933

3034
- name: Install python dependencies
3135
run: |
@@ -45,6 +49,6 @@ jobs:
4549
username: ${{ secrets.ftp_username}}
4650
password: ${{ secrets.ftp_password }}
4751
local-dir: "./docs/api/_build/html/"
48-
server-dir: ${{ secrets.ftp_server_dir }}/dev/
52+
server-dir: ${{ secrets.ftp_server_old_site_dir }}/dev/
4953
protocol: ${{ secrets.ftp_protocol }}
5054
port: ${{ secrets.ftp_port }}

.github/workflows/tools-api-docs-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- name: Check out source-code repository
2222
uses: actions/checkout@v3
2323

24-
- name: Set up Python 3.8
24+
- name: Set up Python 3.11
2525
uses: actions/setup-python@v4
2626
with:
27-
python-version: 3.8
27+
python-version: 3.11
2828

2929
- name: Install python dependencies
3030
run: |
@@ -43,6 +43,6 @@ jobs:
4343
username: ${{ secrets.ftp_username}}
4444
password: ${{ secrets.ftp_password }}
4545
local-dir: "./docs/api/_build/html/"
46-
server-dir: ${{ secrets.ftp_server_dir }}/${{ matrix.dir }}/
46+
server-dir: ${{ secrets.ftp_server_old_site_dir }}/${{ matrix.dir }}/
4747
protocol: ${{ secrets.ftp_protocol }}
4848
port: ${{ secrets.ftp_port }}

CHANGELOG.md

+48-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
11
# nf-core/tools: Changelog
22

3+
# [v2.10 - Nickel Ostrich](https://github.com/nf-core/tools/releases/tag/2.10) + [2023-09-25]
4+
5+
### Template
6+
7+
- Fix links in `multiqc_config.yml` ([#2372](https://github.com/nf-core/tools/pull/2372) and [#2412](https://github.com/nf-core/tools/pull/2412))
8+
- Remove default false from nextflow_schema.json ([#2376](https://github.com/nf-core/tools/pull/2376))
9+
- Add module MULTIQC to modules.config ([#2377](https://github.com/nf-core/tools/pull/2377))
10+
- Add GitHub workflow for automated release announcements ([#2382](https://github.com/nf-core/tools/pull/2382))
11+
- Update the Code of Conduct ([#2381](https://github.com/nf-core/tools/pull/2381))
12+
- Save template information to `.nf-core.yml` and deprecate argument `--template-yaml` for `nf-core sync` ([#2388](https://github.com/nf-core/tools/pull/2388) and [#2389](https://github.com/nf-core/tools/pull/2389))
13+
- ([#2397](https://github.com/nf-core/tools/pull/2397)) Remove fixed Ubuntu test and added to standard testing matrix
14+
- ([#2396](https://github.com/nf-core/tools/pull/2396)) Reduce container finding error to warning since the registries are not consistent.
15+
- ([#2415](https://github.com/nf-core/tools/pull/2415#issuecomment-1709847086)) Add autoMounts for apptainer.
16+
- Remove `igenomes_base` from the schema, so that nf-validation doesn't create a file path and throw errors offline for s3 objects.
17+
- Modified devcontainer permissions so that singularity can be run in Codespaces/VS Code devcontainers ([Commit a103f44](https://github.com/CarsonJM/tools/commit/a103f4484eca8c6d668e4653a4ed8d20faf1b41d))
18+
- Update Gitpod profile resources to reflect base environment settings.
19+
- ([#747](https://github.com/nf-core/tools/issues/747)) Add to the template the code to dump the selected pipeline parameters into a json file.
20+
21+
### Download
22+
23+
- Improved container image resolution and prioritization of http downloads over Docker URIs ([#2364](https://github.com/nf-core/tools/pull/2364)).
24+
- Registries provided with `-l`/`--container-library` will be ignored for modules with explicit container registry specifications ([#2403](https://github.com/nf-core/tools/pull/2403)).
25+
- Fix unintentional downloading of containers in test for the Tower download functionality. Bug reported by @adamrtalbot and @awgymer ([#2434](https://github.com/nf-core/tools/pull/2434)).
26+
27+
### Linting
28+
29+
- Add new command `nf-core subworkflows lint` ([#2379](https://github.com/nf-core/tools/pull/2379))
30+
31+
### Modules
32+
33+
### Subworkflows
34+
35+
- Fix bug: missing subworkflow name when using `nf-core subworkflows create` ([#2435](https://github.com/nf-core/tools/pull/2435))
36+
37+
### General
38+
39+
- Initialise `docker_image_name` to fix `UnboundLocalError` error ([#2374](https://github.com/nf-core/tools/pull/2374))
40+
- Fix prompt pipeline revision during launch ([#2375](https://github.com/nf-core/tools/pull/2375))
41+
- Add a `create-params-file` command to create a YAML parameter file for a pipeline containing parameter documentation and defaults. ([#2362](https://github.com/nf-core/tools/pull/2362))
42+
- Update the Code of Conduct ([#2381](https://github.com/nf-core/tools/pull/2381))
43+
- Remove `--no-git` option from `nf-core create` ([#2394](https://github.com/nf-core/tools/pull/2394))
44+
- Throw warning when custom workflow name contains special characters ([#2401](https://github.com/nf-core/tools/pull/2401))
45+
- Bump version of nf-test snapshot files with `nf-core bump-version` ([#2410](https://github.com/nf-core/tools/pull/2410))
46+
347
# [v2.9 - Chromium Falcon](https://github.com/nf-core/tools/releases/tag/2.9) + [2023-06-29]
448

549
### Template
650

751
- `params.max_multiqc_email_size` is no longer required ([#2273](https://github.com/nf-core/tools/pull/2273))
852
- Remove `cleanup = true` from `test_full.config` in pipeline template ([#2279](https://github.com/nf-core/tools/pull/2279))
953
- Fix usage docs for specifying `params.yaml` ([#2279](https://github.com/nf-core/tools/pull/2279))
10-
- Added stub in modules template ([#2277])(https://github.com/nf-core/tools/pull/2277) [Contributed by @nvnieuwk]
54+
- Added stub in modules template ([#2277](https://github.com/nf-core/tools/pull/2277)) [Contributed by @nvnieuwk]
1155
- Move registry definitions out of profile scope ([#2286])(https://github.com/nf-core/tools/pull/2286)
1256
- Remove `aws_tower` profile ([#2287])(https://github.com/nf-core/tools/pull/2287)
1357
- Fixed the Slack report to include the pipeline name ([#2291](https://github.com/nf-core/tools/pull/2291))
@@ -50,7 +94,7 @@ _In addition, `-r` / `--revision` has been changed to a parameter that can be pr
5094
### Linting
5195

5296
- Warn if container access is denied ([#2270](https://github.com/nf-core/tools/pull/2270))
53-
- Error if module container specification has quay.io as prefix when it shouldn't have ([#2278])(https://github.com/nf-core/tools/pull/2278/files)
97+
- Error if module container specification has quay.io as prefix when it shouldn't have ([#2278](https://github.com/nf-core/tools/pull/2278/files)
5498
- Detect if container is 'simple name' and try to contact quay.io server by default ([#2281](https://github.com/nf-core/tools/pull/2281))
5599
- Warn about null/None/empty default values in `nextflow_schema.json` ([#3328](https://github.com/nf-core/tools/pull/2328))
56100
- Fix linting when creating a pipeline skipping some parts of the template and add CI test ([#2330](https://github.com/nf-core/tools/pull/2330))
@@ -81,7 +125,7 @@ _In addition, `-r` / `--revision` has been changed to a parameter that can be pr
81125
- Consistent syntax for branch checks in PRs ([#2202](https://github.com/nf-core/tools/issues/2202))
82126
- Fixed minor Jinja2 templating bug that caused the PR template to miss a newline
83127
- Updated AWS tests to use newly moved `seqeralabs/action-tower-launch` instead of `nf-core/tower-action`
84-
- Remove `.cff` files from `.editorconfig` [(#2145)[https://github.com/nf-core/tools/pull/2145]]
128+
- Remove `.cff` files from `.editorconfig` ([#2145](https://github.com/nf-core/tools/pull/2145))
85129
- Simplify pipeline README ([#2186](https://github.com/nf-core/tools/issues/2186))
86130
- Added support for the apptainer container engine via `-profile apptainer`. ([#2244](https://github.com/nf-core/tools/issues/2244)) [Contributed by @jfy133]
87131
- Added config `docker.registry` to pipeline template for a configurable default container registry when using Docker containers. Defaults to `quay.io` ([#2133](https://github.com/nf-core/tools/pull/2133))
@@ -1108,7 +1152,7 @@ making a pull-request. See [`.github/CONTRIBUTING.md`](.github/CONTRIBUTING.md)
11081152
- Move `params`section from `base.config` to `nextflow.config`
11091153
- Use `env` scope to export `PYTHONNOUSERSITE` in `nextflow.config` to prevent conflicts with host Python environment
11101154
- Bump minimum Nextflow version to `19.10.0` - required to properly use `env` scope in `nextflow.config`
1111-
- Added support for nf-tower in the travis tests, using public mailbox [email protected]
1155+
- Added support for nf-tower in the travis tests, using public mailbox <[email protected]>
11121156
- Add link to [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and [Semantic Versioning](http://semver.org/spec/v2.0.0.html) to CHANGELOG
11131157
- Adjusted `.travis.yml` checks to allow for `patch` branches to be tested
11141158
- Add Python 3.7 dependency to the `environment.yml` file

0 commit comments

Comments
 (0)