From e84580e30020879cffb6075b75cece801d9665d9 Mon Sep 17 00:00:00 2001 From: kevinmenden Date: Tue, 13 Jul 2021 13:17:55 +0200 Subject: [PATCH 1/7] bump version --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 062e885d95..996bc88d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # nf-core/tools: Changelog +## v2.0.1dev + +### Template + +### General + +Nothing yet + +### Modules + ## [v2.0 - Palladium Platypus](https://github.com/nf-core/tools/releases/tag/2.0) - [2021-07-13] ### :warning: Major enhancements & breaking changes diff --git a/setup.py b/setup.py index 686c011e96..c98d0c5295 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -version = "2.0" +version = "2.0.1dev" with open("README.md") as f: readme = f.read() From e912df62724305f14b9a888039ba36724e07c3a8 Mon Sep 17 00:00:00 2001 From: kevinmenden Date: Tue, 13 Jul 2021 13:18:16 +0200 Subject: [PATCH 2/7] fix sync action --- .github/workflows/sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index a0beb23636..9f3fbdd90f 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -63,7 +63,7 @@ jobs: run: | git config --global user.email "core@nf-co.re" git config --global user.name "nf-core-bot" - nf-core --log-file sync_log_${{ matrix.pipeline }}.txt sync nf-core/${{ matrix.pipeline }} \ + nf-core --log-file sync_log_${{ matrix.pipeline }}.txt sync -d nf-core/${{ matrix.pipeline }} \ --from-branch dev \ --pull-request \ --username nf-core-bot \ From 646715eecbe9ee3a1ce47fa6dbd39406673b6b66 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 13 Jul 2021 15:31:30 +0100 Subject: [PATCH 3/7] Add --dir parameter to pipeline template linting CI --- nf_core/pipeline-template/.github/workflows/linting.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nf_core/pipeline-template/.github/workflows/linting.yml b/nf_core/pipeline-template/.github/workflows/linting.yml index 5a99efb260..afe4197c38 100644 --- a/nf_core/pipeline-template/.github/workflows/linting.yml +++ b/nf_core/pipeline-template/.github/workflows/linting.yml @@ -127,7 +127,7 @@ jobs: GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }} - run: nf-core -l lint_log.txt lint ${GITHUB_WORKSPACE} --markdown lint_results.md + run: nf-core -l lint_log.txt lint --dir ${GITHUB_WORKSPACE} --markdown lint_results.md - name: Save PR number if: ${{ always() }} From 7e9820738c90dd2b57434ed96b0bca90ed26c128 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 13 Jul 2021 15:34:58 +0100 Subject: [PATCH 4/7] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 996bc88d52..6c87af113d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### Template +* Add `--dir` declaration to `nf-core lint` Actions CI in `linting.yml` + ### General Nothing yet From 201f19e3fa35e8398fac7264645ef4be3a00a794 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 13 Jul 2021 15:49:55 +0100 Subject: [PATCH 5/7] Bump version to 2.0.1 --- CHANGELOG.md | 8 ++------ setup.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c87af113d..1b3008801c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,10 @@ # nf-core/tools: Changelog -## v2.0.1dev +## [v2.0.1 - Palladium Platypus II](https://github.com/nf-core/tools/releases/tag/2.0) - [2021-07-13] ### Template -* Add `--dir` declaration to `nf-core lint` Actions CI in `linting.yml` - -### General - -Nothing yet +* Critical tweak to add `--dir` declaration to `nf-core lint` Actions CI in `linting.yml` ### Modules diff --git a/setup.py b/setup.py index c98d0c5295..4f16b75a60 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -version = "2.0.1dev" +version = "2.0.1" with open("README.md") as f: readme = f.read() From ff54ad61b59b3e004c7d755da208c8d7fa08ea02 Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 13 Jul 2021 15:55:20 +0100 Subject: [PATCH 6/7] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b3008801c..721e83e350 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # nf-core/tools: Changelog -## [v2.0.1 - Palladium Platypus II](https://github.com/nf-core/tools/releases/tag/2.0) - [2021-07-13] +## [v2.0.1 - Palladium Platypus Junior](https://github.com/nf-core/tools/releases/tag/2.0.1) - [2021-07-13] ### Template From 43f19c544f553c42e75b8dc9ea0ed2fc37036f4b Mon Sep 17 00:00:00 2001 From: Harshil Patel Date: Tue, 13 Jul 2021 15:59:34 +0100 Subject: [PATCH 7/7] Update CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 721e83e350..6686a728d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ ### Template -* Critical tweak to add `--dir` declaration to `nf-core lint` Actions CI in `linting.yml` +* Critical tweak to add `--dir` declaration to `nf-core lint` GitHub Actions `linting.yml` workflow -### Modules +### General + +* Add `--dir` declaration to `nf-core sync` GitHub Actions `sync.yml` workflow ## [v2.0 - Palladium Platypus](https://github.com/nf-core/tools/releases/tag/2.0) - [2021-07-13]