From 8fed2ae0fe60e40f07177dc8872b149371c653af Mon Sep 17 00:00:00 2001 From: mirpedrol Date: Wed, 31 Aug 2022 13:21:23 +0200 Subject: [PATCH 1/2] lint pyproject.toml file exists and content --- nf_core/lint/files_exist.py | 2 ++ nf_core/lint/files_unchanged.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nf_core/lint/files_exist.py b/nf_core/lint/files_exist.py index a65f28f11d..bc0f732b2e 100644 --- a/nf_core/lint/files_exist.py +++ b/nf_core/lint/files_exist.py @@ -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: @@ -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. diff --git a/nf_core/lint/files_unchanged.py b/nf_core/lint/files_unchanged.py index 7c82d9961b..8b63a5769e 100644 --- a/nf_core/lint/files_unchanged.py +++ b/nf_core/lint/files_unchanged.py @@ -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: @@ -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 From d5cbde0f8ef80bb9e78c44fba3f074e9d7f668eb Mon Sep 17 00:00:00 2001 From: mirpedrol Date: Wed, 31 Aug 2022 13:25:17 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3aa9da72f..ccfac9cd04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,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]