Skip to content

Commit

Permalink
Merge branch 'dev' into pin-plugin-version
Browse files Browse the repository at this point in the history
  • Loading branch information
mashehu authored Dec 19, 2023
2 parents c36bf47 + e33989a commit 7272a7c
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/create-lint-wf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
name: Check out source-code repository

# Set up nf-core/tools
- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-test-lint-wf-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
- uses: actions/checkout@v4
name: Check out source-code repository

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-test-wf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
- uses: actions/checkout@v4
name: Check out source-code repository

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- uses: actions/checkout@v4
name: Check out source-code repository

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
# Override to remove the default --check flag so that we make changes
options: "--color"

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11
- name: python-isort
uses: isort/isort-action@v1.0.0
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ jobs:
- name: Check out source-code repository
uses: actions/checkout@v4

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11
- name: python-isort
uses: isort/isort-action@v1.1.0
with:
Expand All @@ -96,7 +96,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11
cache: "pip"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ["ubuntu-latest"]
strategy:
matrix:
python-version: ["3.8", "3.12"]
python-version: ["3.8", "3.11"]
runner: ["ubuntu-latest"]
include:
- python-version: "3.8"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ jobs:
path: nf-core/${{ matrix.pipeline }}
fetch-depth: "0"

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-api-docs-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
- name: Check out source-code repository
uses: actions/checkout@v4

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-api-docs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- name: Check out source-code repository
uses: actions/checkout@v4

- name: Set up Python 3.12
- name: Set up Python 3.11
uses: actions/setup-python@v4
with:
python-version: 3.12
python-version: 3.11

- name: Install python dependencies
run: |
Expand Down
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
- Update `schema build` functionality to automatically update defaults which have changed in the `nextflow.config`([#2479](https://github.com/nf-core/tools/pull/2479))
- Change testing framework for modules and subworkflows from pytest to nf-test ([#2490](https://github.com/nf-core/tools/pull/2490))
- `bump_version` keeps now the indentation level of the updated version entries ([#2514](https://github.com/nf-core/tools/pull/2514))
- Run tests with Python 3.12 ([#2522](https://github.com/nf-core/tools/pull/2522)).
- Add mypy to pre-commit config for the tools repo ([#2545](https://github.com/nf-core/tools/pull/2545))
- Use Path objects for ComponentCreate and update the structure of components templates ([#2551](https://github.com/nf-core/tools/pull/2551)).
- GitPod base image: swap tool installation back to `conda` from `mamba` ([#2566](https://github.com/nf-core/tools/pull/2566)).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ conda install nf-core
Alternatively, you can create a new environment with both nf-core/tools and nextflow:

```bash
conda create --name nf-core python=3.12 nf-core nextflow
conda create --name nf-core python=3.11 nf-core nextflow
conda activate nf-core
```

Expand Down
2 changes: 1 addition & 1 deletion nf_core/pipeline-template/.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.12"
python-version: "3.11"
architecture: "x64"

- name: Install dependencies
Expand Down

0 comments on commit 7272a7c

Please sign in to comment.