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 2.12.1 #2718

Merged
merged 63 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f287057
Pin dependencies
renovate[bot] Jan 29, 2024
e9e755c
bump to 2.13dev
mirpedrol Jan 29, 2024
917890b
Update CHANGELOG.md
mirpedrol Jan 29, 2024
0ec52ee
Merge pull request #2702 from mirpedrol/bump-2.13dev
mirpedrol Jan 29, 2024
ba7b83c
Merge branch 'dev' into renovate/pin-dependencies
mashehu Jan 29, 2024
23f0dae
handle default read as float when type is number
mirpedrol Jan 29, 2024
32863da
Update pre-commit hook astral-sh/ruff-pre-commit to v0.1.15
renovate[bot] Jan 29, 2024
0f00b4c
[automated] Update CHANGELOG.md
nf-core-bot Jan 29, 2024
beec488
Merge pull request #2705 from nf-core/renovate/astral-sh-ruff-pre-com…
mashehu Jan 30, 2024
125d356
Merge branch 'dev' into linting-defaults
mirpedrol Jan 30, 2024
57e69a5
[automated] Update CHANGELOG.md
nf-core-bot Jan 30, 2024
ef4d323
Merge pull request #2703 from mirpedrol/linting-defaults
mirpedrol Jan 30, 2024
ffdc82d
Merge branch 'dev' into renovate/pin-dependencies
mashehu Jan 30, 2024
41d9839
Merge pull request #2701 from nf-core/renovate/pin-dependencies
mashehu Jan 30, 2024
b3fdaf1
fix ignoring files_unchanged
mirpedrol Jan 30, 2024
c4be616
[automated] Update CHANGELOG.md
nf-core-bot Jan 30, 2024
a28f0d3
fix changelog titles
mirpedrol Jan 30, 2024
4b62733
[automated] Update CHANGELOG.md
nf-core-bot Jan 30, 2024
06a4c32
fix types in files_unchanged
mashehu Jan 30, 2024
e0cf4eb
fix typing in files_exist
mashehu Jan 30, 2024
7a757e4
Merge pull request #2 from mashehu/files-unchanged
mirpedrol Jan 30, 2024
f7827f6
avoid circular import
mashehu Jan 30, 2024
8410892
fix linting
mashehu Jan 30, 2024
d41694b
fix plugin entry
mashehu Jan 30, 2024
20c8203
fix plugin entry
mashehu Jan 30, 2024
81a3f7a
Update nf_core/lint/files_exist.py
mirpedrol Jan 30, 2024
58c7088
Merge pull request #2708 from mirpedrol/changelog-titles
mirpedrol Jan 30, 2024
09f2afa
Merge branch 'files-unchanged' of github.com:mirpedrol/tools into fil…
mashehu Jan 31, 2024
4f6522a
fix paths, ignored listing and remove debugging
mashehu Jan 31, 2024
2a01fa7
print relative path not absolute path in logo cmd
mashehu Jan 31, 2024
16af005
remove rich debugs logs from verbose mode
mashehu Jan 31, 2024
a31c04f
handle relative paths more gracefully
mashehu Jan 31, 2024
c2eb9ac
[automated] Update CHANGELOG.md
nf-core-bot Jan 31, 2024
c0d6bc2
fix types
mashehu Jan 31, 2024
2cb07f4
fix reporting of ignored conditional files
mashehu Jan 31, 2024
1827033
rescue removed ignore statement by logging it directly
mashehu Jan 31, 2024
5893c22
actually don't need conditional in files unchanged if they are not an…
mashehu Jan 31, 2024
59cbb3f
add tests for conditionals
mashehu Jan 31, 2024
c445b93
Update tests/test_lint.py
mashehu Jan 31, 2024
c149db5
Merge pull request #2709 from mashehu/output-path-for-logo
mashehu Jan 31, 2024
09a3514
fix linting
mashehu Jan 31, 2024
ca054a8
Merge pull request #2707 from mirpedrol/files-unchanged
mashehu Jan 31, 2024
445eccf
handle float values in default value comparison
mashehu Jan 31, 2024
04bc025
use type based file default value comparison
mashehu Jan 31, 2024
4e9cb73
[automated] Update CHANGELOG.md
nf-core-bot Jan 31, 2024
1ada287
Merge branch 'dev' into type-schema
mashehu Jan 31, 2024
cdedbc5
Update codecov/codecov-action action to v4
renovate[bot] Jan 31, 2024
dc92977
[automated] Update CHANGELOG.md
nf-core-bot Jan 31, 2024
5ff453e
Merge pull request #2713 from nf-core/renovate/codecov-codecov-action…
mashehu Feb 1, 2024
4840879
let renovate ignore nf-core-bot
mashehu Feb 1, 2024
424d21b
[automated] Update CHANGELOG.md
nf-core-bot Feb 1, 2024
571413e
Merge pull request #2716 from mashehu/ignore-nf-core-bot-in-renovate
mashehu Feb 1, 2024
0fe6533
Update tests/lint/nextflow_config.py
mashehu Feb 1, 2024
ef65f76
fix schema tests
mashehu Feb 1, 2024
d7e81bd
Merge pull request #2712 from mashehu/type-schema
mashehu Feb 1, 2024
0bf3b0e
bump to 2.12.1
mashehu Feb 1, 2024
20ab24b
Merge pull request #2717 from mashehu/bump-version
mashehu Feb 1, 2024
86926c5
Revert "Pin dependencies"
mashehu Feb 1, 2024
6ffb9e3
[automated] Update CHANGELOG.md
nf-core-bot Feb 1, 2024
4135e3b
Merge branch 'dev' into revert-dep-pin
mashehu Feb 1, 2024
0382956
update CHANGELOG
mirpedrol Feb 1, 2024
1114256
Merge pull request #2719 from mashehu/revert-dep-pin
mashehu Feb 1, 2024
693e967
Generate new screengrabs with rich-codex
github-actions[bot] Feb 1, 2024
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
1 change: 1 addition & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
registryUrls: ["docker.io"],
},
],
gitIgnoredAuthors: ["[email protected]"],
}
8 changes: 5 additions & 3 deletions .github/workflows/changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,14 @@ def _skip_existing_entry_for_this_pr(line: str, same_section: bool = True) -> st
# If the line already contains a link to the PR, don't add it again.
line = _skip_existing_entry_for_this_pr(line, same_section=False)

if line.startswith("# ") and not line.strip() == "# nf-core/tools: Changelog": # Version header, e.g. "# v2.12dev"
if (
line.startswith("## ") and not line.strip() == "# nf-core/tools: Changelog"
): # Version header, e.g. "## v2.12dev"
print(f"Found version header: {line.strip()}")
updated_lines.append(line)

# Parse version from the line `# v2.12dev` or
# `# [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]` ...
# Parse version from the line `## v2.12dev` or
# `## [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]` ...
if not (m := re.match(r".*(v\d+\.\d+(dev)?).*", line)):
print(f"Cannot parse version from line {line.strip()}.", file=sys.stderr)
sys.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fix-linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
contains(github.event.comment.html_url, '/pull/') &&
contains(github.event.comment.body, '@nf-core-bot fix linting') &&
github.repository == 'nf-core/tools'
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
# Use the @nf-core-bot token to check out so we can push later
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
coverage report
coverage xml

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4
with:
files: coverage.xml
env:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.14
rev: v0.1.15
hooks:
- id: ruff # linter
args: [--fix, --exit-non-zero-on-fix] # sort imports and fix
Expand Down
28 changes: 22 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# nf-core/tools: Changelog

# [v2.12 - Aluminium Wolf](https://github.com/nf-core/tools/releases/tag/2.11) - [2024-01-29]
## [v2.12.1 - Aluminium Wolf - Patch](https://github.com/nf-core/tools/releases/tag/2.12.1) - [2024-02-01]

### Linting

- Handle default values of type number from nextflow schema ([#2703](https://github.com/nf-core/tools/pull/2703))
- fix ignoring files_unchanged ([#2707](https://github.com/nf-core/tools/pull/2707))

### General

- Update pre-commit hook astral-sh/ruff-pre-commit to v0.1.15 ([#2705](https://github.com/nf-core/tools/pull/2705))
- use types for default value comparison ([#2712](https://github.com/nf-core/tools/pull/2712))
- fix changelog titles ([#2708](https://github.com/nf-core/tools/pull/2708))
- Print relative path not absolute path in logo cmd log output ([#2709](https://github.com/nf-core/tools/pull/2709))
- Update codecov/codecov-action action to v4 ([#2713](https://github.com/nf-core/tools/pull/2713))
- Ignore nf-core-bot in renovate PRs ([#2716](https://github.com/nf-core/tools/pull/2716))

## [v2.12 - Aluminium Wolf](https://github.com/nf-core/tools/releases/tag/2.12) - [2024-01-29]

### Template

Expand Down Expand Up @@ -46,7 +62,7 @@
- Update peter-evans/create-or-update-comment action to v4 ([#2683](https://github.com/nf-core/tools/pull/2683))
- Update peter-evans/create-or-update-comment action to v4 ([#2695](https://github.com/nf-core/tools/pull/2695))

# [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]
## [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]

### Template

Expand All @@ -57,7 +73,7 @@

- Only dump `modules.json` when it is modified ([#2609](https://github.com/nf-core/tools/pull/2609))

# [v2.11 - Magnesium Dragon](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-19]
## [v2.11 - Magnesium Dragon](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-19]

### Template

Expand Down Expand Up @@ -113,7 +129,7 @@
- Sort the `installed_by` list in `modules.json` ([#2570](https://github.com/nf-core/tools/pull/2570)).
- Unset env variable JAVA_TOOL_OPTIONS in gitpod ([#2569](https://github.com/nf-core/tools/pull/2569))

# [v2.10 - Nickel Ostrich](https://github.com/nf-core/tools/releases/tag/2.10) + [2023-09-25]
## [v2.10 - Nickel Ostrich](https://github.com/nf-core/tools/releases/tag/2.10) + [2023-09-25]

### Template

Expand Down Expand Up @@ -157,7 +173,7 @@
- Throw warning when custom workflow name contains special characters ([#2401](https://github.com/nf-core/tools/pull/2401))
- Bump version of nf-test snapshot files with `nf-core bump-version` ([#2410](https://github.com/nf-core/tools/pull/2410))

# [v2.9 - Chromium Falcon](https://github.com/nf-core/tools/releases/tag/2.9) + [2023-06-29]
## [v2.9 - Chromium Falcon](https://github.com/nf-core/tools/releases/tag/2.9) + [2023-06-29]

### Template

Expand Down Expand Up @@ -225,7 +241,7 @@ _In addition, `-r` / `--revision` has been changed to a parameter that can be pr
- Refgenie: Create `nxf_home/nf-core/refgenie_genomes.config` path if it doesn't exist ([#2312](https://github.com/nf-core/tools/pull/2312))
- Add CI tests to test running a pipeline whe it's created from a template skipping different areas

# [v2.8 - Ruthenium Monkey](https://github.com/nf-core/tools/releases/tag/2.8) - [2023-04-27]
## [v2.8 - Ruthenium Monkey](https://github.com/nf-core/tools/releases/tag/2.8) - [2023-04-27]

### Template

Expand Down
Loading