Skip to content

Commit e5f0bd3

Browse files
authored
Merge branch 'dev' into vs-code-tests
2 parents a39ed59 + 98285e3 commit e5f0bd3

Some content is hidden

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

43 files changed

+117
-97
lines changed

.github/actions/create-lint-wf/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ runs:
1515
cd create-lint-wf
1616
export NXF_WORK=$(pwd)
1717
18-
# Set up Nextflow
1918
- name: Install Nextflow
2019
uses: nf-core/setup-nextflow@v2
2120
with:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ concurrency:
2727
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2828
cancel-in-progress: true
2929

30-
env:
31-
NXF_ANSI_LOG: false
32-
3330
jobs:
3431
MakeTestWorkflow:
3532
runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
3633
env:
3734
NXF_ANSI_LOG: false
35+
3836
strategy:
3937
matrix:
4038
NXF_VER:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
needs: prepare-matrix
5252
env:
5353
NXF_ANSI_LOG: false
54+
5455
strategy:
5556
matrix:
5657
TEMPLATE: ${{ fromJson(needs.prepare-matrix.outputs.all_features) }}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@ concurrency:
2727
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2828
cancel-in-progress: true
2929

30-
env:
31-
NXF_ANSI_LOG: false
32-
3330
jobs:
3431
RunTestWorkflow:
3532
# use the runner given by the input if it is dispatched manually, run on github if it is a rerun or on self-hosted by default
3633
runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
3734
env:
3835
NXF_ANSI_LOG: false
36+
3937
strategy:
4038
matrix:
4139
NXF_VER:

.gitpod.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,4 @@ tasks:
99
1010
vscode:
1111
extensions:
12-
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
13-
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
14-
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
15-
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
16-
- nextflow.nextflow # Nextflow syntax highlighting
17-
- oderwat.indent-rainbow # Highlight indentation level
18-
- streetsidesoftware.code-spell-checker # Spelling checker for source code
19-
- charliermarsh.ruff # Code linter Ruff
12+
- nf-core.nf-core-extensionpack # https://github.com/nf-core/vscode-extensionpack

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.8.1
3+
rev: v0.8.2
44
hooks:
55
- id: ruff # linter
66
args: [--fix, --exit-non-zero-on-fix] # sort imports and fix

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
### Linting
2626

2727
- allow mixed `str` and `dict` entries in lint config ([#3228](https://github.com/nf-core/tools/pull/3228))
28+
- fix meta_yml linting test failing due to module.process_name always being "" ([#3317](https://github.com/nf-core/tools/pull/3317))
29+
- fix module section regex matching wrong things ([#3321](https://github.com/nf-core/tools/pull/3321))
2830

2931
### Modules
3032

@@ -33,6 +35,7 @@
3335
### Subworkflows
3436

3537
- Add `nf-core subworkflows patch` command ([#2861](https://github.com/nf-core/tools/pull/2861))
38+
- Improve subworkflow nf-test migration warning ([#3298](https://github.com/nf-core/tools/pull/3298))
3639

3740
### General
3841

@@ -46,6 +49,7 @@
4649
- Update GitHub Actions ([#3237](https://github.com/nf-core/tools/pull/3237))
4750
- add `--dir/-d` option to schema commands ([#3247](https://github.com/nf-core/tools/pull/3247))
4851
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.7.1 ([#3250](https://github.com/nf-core/tools/pull/3250))
52+
- fix headers in api docs ([#3323](https://github.com/nf-core/tools/pull/3323))
4953
- handle new schema structure in `nf-core pipelines create-params-file` ([#3276](https://github.com/nf-core/tools/pull/3276))
5054
- Update Gitpod image to use Miniforge instead of Miniconda([#3274](https://github.com/nf-core/tools/pull/3274))
5155
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.7.3 ([#3275](https://github.com/nf-core/tools/pull/3275))
@@ -56,6 +60,10 @@
5660
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.8.0 ([#3299](https://github.com/nf-core/tools/pull/3299))
5761
- Update gitpod/workspace-base Docker digest to 12853f7 ([#3309](https://github.com/nf-core/tools/pull/3309))
5862
- Run pre-commit when testing linting the template pipeline ([#3280](https://github.com/nf-core/tools/pull/3280))
63+
- Update pre-commit hook astral-sh/ruff-pre-commit to v0.8.2 ([#3325](https://github.com/nf-core/tools/pull/3325))
64+
- Make CLI prompt less nf-core specific ([#3326](https://github.com/nf-core/tools/pull/3326))
65+
- Update gitpod vscode extensions to use nf-core extension pack ([#3327](https://github.com/nf-core/tools/pull/3327))
66+
- Remove toList() channel operation from inside onComplete block ([#3304](https://github.com/nf-core/tools/pull/3304))
5967
- build: Setup VS Code tests ([#3292](https://github.com/nf-core/tools/pull/3292))
6068

6169
## [v3.0.2 - Titanium Tapir Patch](https://github.com/nf-core/tools/releases/tag/3.0.2) - [2024-10-11]

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim@sha256:2a6386ad2db20e7f55073f69a98d6da2cf9f168e05e7487d2670baeb9b7601c5
1+
FROM python:3.12-slim@sha256:2b0079146a74e23bf4ae8f6a28e1b484c6292f6fb904cbb51825b4a19812fcd8
22
33
description="Docker image containing requirements for nf-core/tools"
44

docs/api/_src/api/pipelines/bump_version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nf_core.bump_version
1+
# nf_core.pipelines.bump_version
22

33
```{eval-rst}
44
.. automodule:: nf_core.pipelines.bump_version

docs/api/_src/api/pipelines/create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nf_core.create
1+
# nf_core.pipelines.create
22

33
```{eval-rst}
44
.. automodule:: nf_core.pipelines.create

0 commit comments

Comments
 (0)