Skip to content

Commit

Permalink
Merge branch 'dev' into patch2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mirpedrol authored Aug 31, 2022
2 parents 2d7360f + ec60f53 commit f31c9e9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Patch release to fix black linting in pipelines ([#1789](https://github.com/nf-core/tools/pull/1789))
- Add isort options to pyproject.toml ([#1792](https://github.com/nf-core/tools/pull/1792))
- Lint pyproject.toml file exists and content ([#1795](https://github.com/nf-core/tools/pull/1795))
- Update GitHub PyPI package release action to v1 ([#1785](https://github.com/nf-core/tools/pull/1785))

## [v2.5 - Gold Otter](https://github.com/nf-core/tools/releases/tag/2.5) - [2022-08-30]
Expand Down
2 changes: 2 additions & 0 deletions nf_core/lint/files_exist.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def files_exist(self):
.github/workflows/awstest.yml
.github/workflows/awsfulltest.yml
lib/WorkflowPIPELINE.groovy
pyproject.toml
Files that *must not* be present:
Expand Down Expand Up @@ -174,6 +175,7 @@ def files_exist(self):
[os.path.join(".github", "workflows", "awsfulltest.yml")],
[os.path.join("lib", f"Workflow{short_name[0].upper()}{short_name[1:]}.groovy")],
["modules.json"],
["pyproject.toml"],
]

# List of strings. Fails / warns if any of the strings exist.
Expand Down
3 changes: 2 additions & 1 deletion nf_core/lint/files_unchanged.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def files_unchanged(self):
.gitignore
.prettierignore
pyproject.toml
.. tip:: You can configure the ``nf-core lint`` tests to ignore any of these checks by setting
the ``files_unchanged`` key as follows in your ``.nf-core.yml`` config file. For example:
Expand Down Expand Up @@ -110,7 +111,7 @@ def files_unchanged(self):
[os.path.join("lib", "NfcoreTemplate.groovy")],
]
files_partial = [
[".gitignore", ".prettierignore"],
[".gitignore", ".prettierignore", "pyproject.toml"],
]

# Only show error messages from pipeline creation
Expand Down

0 comments on commit f31c9e9

Please sign in to comment.