diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 5437eeba8b..1f3d241d5f 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -21,11 +21,19 @@ jobs: uses: mshick/add-pr-comment@v1 with: message: | + ## This PR is against the `master` branch :x: + + * Do not close this PR + * Click _Edit_ and change the `base` to `dev` + * This CI test will remain failed until you push a new commit + + --- + Hi @${{ github.event.pull_request.user.login }}, - It looks like this pull-request has been made against the ${{github.event.pull_request.base.repo.full_name}} `master` branch. + It looks like this pull-request is has been made against the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `master` branch. The `master` branch on nf-core repositories should always contain code from the latest release. - Because of this, PRs to `master` are only allowed if they come from the ${{github.event.pull_request.base.repo.full_name}} `dev` branch. + Because of this, PRs to `master` are only allowed if they come from the [${{github.event.pull_request.head.repo.full_name }}](https://github.com/${{github.event.pull_request.head.repo.full_name }}) `dev` branch. You do not need to close this PR, you can change the target branch to `dev` by clicking the _"Edit"_ button at the top of this page. Note that even after this, the test will continue to show as failing until you push a new commit. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f384657da..7e27d8ca0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # nf-core/tools: Changelog -## v1.13.1dev - -### Bugs fixed +## [v1.13.1 - Copper Crocodile Patch :crocodile: :pirate_flag:](https://github.com/nf-core/tools/releases/tag/1.13.1) - [2021-03-19] * Fixed bug in pipeline linting markdown output that gets posted to PR comments [[#914]](https://github.com/nf-core/tools/issues/914) +* Made text for the PR branch CI check less verbose with a TLDR in bold at the top +* A number of minor tweaks to the new `nf-core modules lint` code ## [v1.13 - Copper Crocodile](https://github.com/nf-core/tools/releases/tag/1.13) - [2021-03-18] diff --git a/nf_core/modules/lint.py b/nf_core/modules/lint.py index 7772ea57a8..921cb84735 100644 --- a/nf_core/modules/lint.py +++ b/nf_core/modules/lint.py @@ -246,7 +246,7 @@ def get_installed_modules(self): for m in sorted([m for m in os.listdir(nfcore_modules_dir) if not m == "lib"]): if not os.path.isdir(os.path.join(nfcore_modules_dir, m)): raise ModuleLintException( - f"File found in '{nfcore_modules_dir}': '{m}'! This directly should only contain module directories." + f"File found in '{nfcore_modules_dir}': '{m}'! This directory should only contain module directories." ) m_content = os.listdir(os.path.join(nfcore_modules_dir, m)) # Not a module, but contains sub-modules @@ -326,7 +326,7 @@ def _s(some_list): ) table = Table(style="green", box=rich.box.ROUNDED) table.add_column("Module name", width=max_mod_name_len) - table.add_column("File path", no_wrap=True) + table.add_column("File path") table.add_column("Test message") table = format_result(self.passed, table) console.print(table) @@ -340,7 +340,7 @@ def _s(some_list): ) table = Table(style="yellow", box=rich.box.ROUNDED) table.add_column("Module name", width=max_mod_name_len) - table.add_column("File path", no_wrap=True) + table.add_column("File path") table.add_column("Test message") table = format_result(self.warned, table) console.print(table) @@ -352,7 +352,7 @@ def _s(some_list): ) table = Table(style="red", box=rich.box.ROUNDED) table.add_column("Module name", width=max_mod_name_len) - table.add_column("File path", no_wrap=True) + table.add_column("File path") table.add_column("Test message") table = format_result(self.failed, table) console.print(table) diff --git a/setup.py b/setup.py index 1a4aa78c7d..280d21559a 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages import sys -version = "1.13.1dev" +version = "1.13.1" with open("README.md") as f: readme = f.read()