Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
dd00cde
Bump to 1.14dev
ewels Mar 19, 2021
9439b3c
Merge pull request #925 from ewels/master
drpatelh Mar 19, 2021
00307a3
Add nf-core colors to rtd sphinx theme
Mar 19, 2021
e7dddec
fix for linting
Mar 19, 2021
d058b1a
dummy commit to run the tests one more time 🙂
Mar 19, 2021
a59f497
fix bug for updated messages
KevinMenden Mar 22, 2021
d1a9fb7
update pytests
KevinMenden Mar 22, 2021
153e5fa
black
KevinMenden Mar 22, 2021
f002538
Merge pull request #930 from KevinMenden/dev
ewels Mar 22, 2021
f67d063
Merge pull request #926 from mashehu/add-nf-core-colors-to-docs
ewels Mar 22, 2021
6536ed7
started with more robust jinja2 templating
KevinMenden Mar 22, 2021
0771195
add pytest-workflow dep
KevinMenden Mar 22, 2021
676cf8f
added check for binary extensions
KevinMenden Mar 22, 2021
4275b1e
Merge pull request #938 from KevinMenden/add-pytest-workflow
rivera10 Mar 22, 2021
54b0eb8
remove containsKey()
KevinMenden Mar 22, 2021
f15824e
add 'params.name' to failing params in nextflow.config lint check
KevinMenden Mar 22, 2021
1c0291e
Merge pull request #939 from KevinMenden/add-name-to-lint
ewels Mar 22, 2021
45f0009
Split create-lint-wf commands into separate steps
ewels Mar 22, 2021
879c12d
Automated PR comments for Python and Markdownlint CI test failures
ewels Mar 22, 2021
c9a3b11
Changelog, bump v1.13.2dev
ewels Mar 22, 2021
a316a3a
better logging for directory
KevinMenden Mar 22, 2021
b3c1d93
changelog
KevinMenden Mar 22, 2021
c51f8f0
Merge pull request #941 from ewels/split-steps-create-lint-wf
ewels Mar 22, 2021
3261493
Refactor code for tidyness points
ewels Mar 22, 2021
655a1cf
Merge branch 'dev' into better-log-output
ewels Mar 23, 2021
3dd6427
Merge pull request #942 from KevinMenden/better-log-output
ewels Mar 23, 2021
e0f0d1b
Merge pull request #936 from KevinMenden/fix-create
ewels Mar 23, 2021
e6ccc10
Pipeline create - apply file permissions to new files
ewels Mar 23, 2021
2013dd1
File perms on nf-core modules create too
ewels Mar 23, 2021
dcec829
Changelog
ewels Mar 23, 2021
b28dcaf
Sometimes I ❤️ CI tests
ewels Mar 23, 2021
da108c6
added comment in release checklist
KevinMenden Mar 23, 2021
f16f281
bumped nextflow versions to edge release
KevinMenden Mar 23, 2021
55761d5
Merge pull request #945 from KevinMenden/release-checklist
ewels Mar 23, 2021
618179c
Update CHANGELOG.md
ewels Mar 23, 2021
cb5313d
Merge pull request #944 from ewels/jinja-file-perms
ewels Mar 23, 2021
6c9a8d3
Add code lint CI PR comments to pipeline template
ewels Mar 23, 2021
ac62403
Changelog
ewels Mar 23, 2021
7a1c333
Copy file if any exception with jinja in pipeline create
ewels Mar 23, 2021
719d22d
Make lint summary table coloured according to overall status
ewels Mar 23, 2021
217ecea
Proper {{}} escaping in workflow for new comments
ewels Mar 23, 2021
6084456
Changelog
ewels Mar 23, 2021
e79602e
Merge pull request #946 from ewels/code-lint-comments
ewels Mar 23, 2021
b7bd4c4
Merge branch 'dev' into bugfix-tweaks
ewels Mar 23, 2021
17fbcf8
Use '21.03.0-edge' in bump-versions code
ewels Mar 23, 2021
29e98d1
Merge pull request #947 from ewels/bugfix-tweaks
ewels Mar 23, 2021
a14af2f
Find yml and yaml files for yaml linting
ewels Mar 23, 2021
f714baa
Log API headers on fail - create PR
ewels Mar 23, 2021
01dcdf2
Sync - keep trying if we get 403 errors
ewels Mar 23, 2021
07c3978
Changelog
ewels Mar 23, 2021
ad0cddb
Merge pull request #948 from ewels/bugfix-tweaks
ewels Mar 23, 2021
d0633b2
Fix copypasta syntax error
ewels Mar 23, 2021
3f15ce0
fix tests
ewels Mar 23, 2021
fa00cde
Reduce diff - didn't need to indent that bit
ewels Mar 23, 2021
1f888a5
Merge pull request #949 from ewels/sync-headers-abuse
ewels Mar 23, 2021
ba85e6c
Bump to v1.13.2
ewels Mar 23, 2021
8e31d7f
Merge pull request #950 from ewels/v1.13.2-bump
ewels Mar 23, 2021
54f7f18
Update .github/workflows/pytest.yml
ewels Mar 23, 2021
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
15 changes: 8 additions & 7 deletions .github/RELEASE_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

1. Check issue milestones to see outstanding issues to resolve if possible or transfer to the milestones for the next release e.g. [`v1.9`](https://github.com/nf-core/tools/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.9)
2. Most importantly, pick an undeniably outstanding [name](http://www.codenamegenerator.com/) for the release where *Prefix* = *Metal* and *Dictionary* = *Animal*.
3. Create a PR to `dev` to bump the version in `CHANGELOG.md` and `setup.py`.
4. Make sure all CI tests are passing!
5. Create a PR from `dev` to `master`
6. Make sure all CI tests are passing again (additional tests are run on PRs to `master`)
7. Request review (2 approvals required)
8. Merge the PR into `master`
9. Once CI tests on commit have passed, create a new release copying the `CHANGELOG` for that release into the description section.
3. Check whether the GitHub Actions workflow scripts need updating of the Nextflow versions
4. Create a PR to `dev` to bump the version in `CHANGELOG.md` and `setup.py`.
5. Make sure all CI tests are passing!
6. Create a PR from `dev` to `master`
7. Make sure all CI tests are passing again (additional tests are run on PRs to `master`)
8. Request review (2 approvals required)
9. Merge the PR into `master`
10. Once CI tests on commit have passed, create a new release copying the `CHANGELOG` for that release into the description section.

## After release

Expand Down
39 changes: 26 additions & 13 deletions .github/workflows/create-lint-wf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on: [push, pull_request]
jobs:
MakeTestWorkflow:
runs-on: ubuntu-latest
env:
NXF_VER: 21.03.0-edge
steps:
- uses: actions/checkout@v2
name: Check out source-code repository
Expand All @@ -22,21 +24,32 @@ jobs:
env:
CAPSULE_LOG: none
run: |
mkdir /tmp/nextflow
cd /tmp/nextflow
wget -qO- get.nextflow.io | bash
sudo ln -s /tmp/nextflow/nextflow /usr/local/bin/nextflow
sudo mv nextflow /usr/local/bin/

- name: Run nf-core/tools
run: |
nf-core --log-file log.txt create -n testpipeline -d "This pipeline is for testing" -a "Testing McTestface"
nf-core --log-file log.txt lint nf-core-testpipeline --fail-ignored
nf-core --log-file log.txt list
nf-core --log-file log.txt licences nf-core-testpipeline
nf-core --log-file log.txt sync nf-core-testpipeline/
nf-core --log-file log.txt schema build nf-core-testpipeline/ --no-prompts
nf-core --log-file log.txt bump-version nf-core-testpipeline/ 1.1
nf-core --log-file log.txt modules install nf-core-testpipeline/ --tool fastqc
- name: nf-core create
run: nf-core --log-file log.txt create -n testpipeline -d "This pipeline is for testing" -a "Testing McTestface"

- name: nf-core lint
run: nf-core --log-file log.txt lint nf-core-testpipeline --fail-ignored

- name: nf-core list
run: nf-core --log-file log.txt list

- name: nf-core licences
run: nf-core --log-file log.txt licences nf-core-testpipeline

- name: nf-core sync
run: nf-core --log-file log.txt sync nf-core-testpipeline/

- name: nf-core schema
run: nf-core --log-file log.txt schema build nf-core-testpipeline/ --no-prompts

- name: nf-core bump-version
run: nf-core --log-file log.txt bump-version nf-core-testpipeline/ 1.1

- name: nf-core modules install
run: nf-core --log-file log.txt modules install nf-core-testpipeline/ --tool fastqc

- name: Upload log file artifact
if: ${{ always() }}
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,29 @@ jobs:

- name: Run Markdownlint
run: markdownlint ${GITHUB_WORKSPACE} -c ${GITHUB_WORKSPACE}/.github/markdownlint.yml

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## Markdown linting is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install `markdownlint-cli`
* On Mac: `brew install markdownlint-cli`
* Everything else: [Install `npm`](https://www.npmjs.com/get-npm) then [install `markdownlint-cli`](https://www.npmjs.com/package/markdownlint-cli) (`npm install -g markdownlint-cli`)
* Fix the markdown errors
* Automatically: `markdownlint . --config .github/markdownlint.yml --fix`
* Manually resolve anything left from `markdownlint . --config .github/markdownlint.yml`

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up markdownlint in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false
57 changes: 28 additions & 29 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,46 @@ name: Python tests
on:
push:
paths:
- '**.py'
- "**.py"
pull_request:
paths:
- '**.py'
- "**.py"

jobs:
pytest:

runs-on: ubuntu-latest
env:
NXF_VER: 21.03.0-edge
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v2
name: Check out source-code repository
- uses: actions/checkout@v2
name: Check out source-code repository

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Install python dependencies
run: |
python -m pip install --upgrade pip -r requirements-dev.txt
pip install -e .
- name: Install python dependencies
run: |
python -m pip install --upgrade pip -r requirements-dev.txt
pip install -e .

- name: Install Nextflow
env:
- name: Install Nextflow
env:
CAPSULE_LOG: none
run: |
mkdir /tmp/nextflow
cd /tmp/nextflow
wget -qO- get.nextflow.io | bash
sudo ln -s /tmp/nextflow/nextflow /usr/local/bin/nextflow

- name: Test with pytest
run: python3 -m pytest --color=yes --cov-report=xml --cov-config=.github/.coveragerc --cov=nf_core

- uses: codecov/codecov-action@v1
name: Upload code coverage report
with:
if: success()
token: ${{ secrets.CODECOV_TOKEN }}
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/

- name: Test with pytest
run: python3 -m pytest --color=yes --cov-report=xml --cov-config=.github/.coveragerc --cov=nf_core

- uses: codecov/codecov-action@v1
name: Upload code coverage report
with:
if: success()
token: ${{ secrets.CODECOV_TOKEN }}
22 changes: 22 additions & 0 deletions .github/workflows/python-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,25 @@ jobs:

- name: Check code lints with Black
uses: jpetrucciani/black-check@master

# If the above check failed, post a comment on the PR explaining the failure
- name: Post PR comment
if: failure()
uses: mshick/add-pr-comment@v1
with:
message: |
## Python linting (`black`) is failing

To keep the code consistent with lots of contributors, we run automated code consistency checks.
To fix this CI test, please run:

* Install [`black`](https://black.readthedocs.io/en/stable/): `pip install black`
* Fix formatting errors in your pipeline: `black .`

Once you push these changes the test should pass, and you can hide this comment :+1:

We highly recommend setting up Black in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!

Thanks again for your contribution!
repo-token: ${{ secrets.GITHUB_TOKEN }}
allow-repeats: false
2 changes: 2 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
jobs:
get-pipelines:
runs-on: ubuntu-latest
env:
NXF_VER: 21.03.0-edge
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# nf-core/tools: Changelog

## [v1.13.2 - Copper Crocodile CPR :crocodile: :face_with_head_bandage:](https://github.com/nf-core/tools/releases/tag/1.13.2) - [2021-03-23]

* Added better logging message if a user doesn't specificy the directory correctly with `nf-core modules` commands [[#942](https://github.com/nf-core/tools/pull/942)]
* Fixed parameter validation bug caused by JSONObject [[#937](https://github.com/nf-core/tools/issues/937)]
* Fixed template creation error regarding file permissions [[#932](https://github.com/nf-core/tools/issues/932)]
* Split the `create-lint-wf` tests up into separate steps in GitHub Actions to make the CI results easier to read
* Added automated PR comments to the Markdown, YAML and Python lint CI tests to explain failures (tools and pipeline template)
* Make `nf-core lint` summary table borders coloured according to overall pass / fail status
* Attempted a fix for the automated sync when we submit too many PRs at once [[#911](https://github.com/nf-core/tools/issues/911)]

## [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)
Expand Down
Loading