Skip to content

Commit b67fd2a

Browse files
authored
Merge pull request #784 from nf-core/dev
v1.12 dev -> master
2 parents 9b3eec9 + d06c16f commit b67fd2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+383
-197
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Bug report
3+
about: Report something that is broken or incorrect
4+
labels: bug
5+
---
6+
7+
<!--
8+
# nf-core/tools bug report
9+
10+
Hi there!
11+
12+
Thanks for telling us about a problem with the nf-core/tools package.
13+
Please delete this text and anything that's not relevant from the template below:
14+
-->
15+
16+
## Description of the bug
17+
18+
<!-- A clear and concise description of what the bug is. -->
19+
20+
## Steps to reproduce
21+
22+
Steps to reproduce the behaviour:
23+
24+
1. Command line: <!-- [e.g. `nf-core lint ...`] -->
25+
2. See error: <!-- [Please provide your error message] -->
26+
27+
## Expected behaviour
28+
29+
<!-- A clear and concise description of what you expected to happen. -->
30+
31+
## System
32+
33+
- Hardware: <!-- [e.g. HPC, Desktop, Cloud...] -->
34+
- Executor: <!-- [e.g. slurm, local, awsbatch...] -->
35+
- OS: <!-- [e.g. CentOS Linux, macOS, Linux Mint...] -->
36+
- Version of nf-core/tools: <!-- [e.g. 1.1, 1.5, 1.8.2...] -->
37+
- Python version: <!-- [e.g. 3.7, 3.8...] -->
38+
39+
## Nextflow Installation
40+
41+
- Version: <!-- [e.g. 19.10.0] -->
42+
43+
## Additional context
44+
45+
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Join nf-core
4+
url: https://nf-co.re/join
5+
about: Please join the nf-core community here
6+
- name: "Slack #tools channel"
7+
url: https://nfcore.slack.com/channels/tools
8+
about: Discussion about the nf-core/tools package
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for the nf-core website
4+
labels: enhancement
5+
---
6+
7+
<!--
8+
# nf-core/tools feature request
9+
10+
Hi there!
11+
12+
Thanks for suggesting a new feature for the nf-core/tools package!
13+
Please delete this text and anything that's not relevant from the template below:
14+
-->
15+
16+
## Is your feature request related to a problem? Please describe
17+
18+
<!-- A clear and concise description of what the problem is. -->
19+
20+
<!-- e.g. [I'm always frustrated when ...] -->
21+
22+
## Describe the solution you'd like
23+
24+
<!-- A clear and concise description of what you want to happen. -->
25+
26+
## Describe alternatives you've considered
27+
28+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
29+
30+
## Additional context
31+
32+
<!-- Add any other context about the feature request here. -->

.github/workflows/branch.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ name: nf-core branch protection
22
# This workflow is triggered on PRs to master branch on the repository
33
# It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
44
on:
5-
pull_request:
5+
pull_request_target:
66
branches: [master]
77

88
jobs:
99
test:
1010
runs-on: ubuntu-latest
1111
steps:
12-
1312
# PRs to the nf-core repo master branch are only ok if coming from the nf-core repo `dev` or any `patch` branches
1413
- name: Check PRs
1514
if: github.repository == 'nf-core/tools'

.github/workflows/create-lint-wf.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
pip install .
2020
2121
- name: Install Nextflow
22+
env:
23+
CAPSULE_LOG: none
2224
run: |
2325
mkdir /tmp/nextflow
2426
cd /tmp/nextflow

.github/workflows/pytest.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
pip install -e .
3333
3434
- name: Install Nextflow
35+
env:
36+
CAPSULE_LOG: none
3537
run: |
3638
mkdir /tmp/nextflow
3739
cd /tmp/nextflow

.github/workflows/sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
pip install .
4646
4747
- name: Install Nextflow
48+
env:
49+
CAPSULE_LOG: none
4850
run: |
4951
mkdir /tmp/nextflow
5052
cd /tmp/nextflow

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# nf-core/tools: Changelog
22

3+
## [v1.12 - Mercury Weasel](https://github.com/nf-core/tools/releases/tag/1.12) - [2020-11-19]
4+
5+
### Tools helper code
6+
7+
* Updated `nf_core` documentation generator for building [https://nf-co.re/tools-docs/](https://nf-co.re/tools-docs/)
8+
9+
### Template
10+
11+
* Make CI comments work with PRs from forks [[#765](https://github.com/nf-core/tools/issues/765)]
12+
* Branch protection and linting results should now show on all PRs
13+
* Updated GitHub issue templates, which had stopped working
14+
* Refactored GitHub Actions so that the AWS full-scale tests are triggered after docker build is finished
15+
* DockerHub push workflow split into two - one for dev, one for releases
16+
* Updated actions to no longer use `set-env` which is now depreciating [[#739](https://github.com/nf-core/tools/issues/739)]
17+
* Added config import for `test_full` in `nextflow.config`
18+
* Switched depreciated `$baseDir` to `$projectDir`
19+
* Updated minimum Nextflow version to `20.04.10`
20+
* Make Nextflow installation less verbose in GitHub Actions [[#780](https://github.com/nf-core/tools/pull/780)]
21+
22+
### Linting
23+
24+
* Updated code to display colours in GitHub Actions log output
25+
* Allow tests to pass with `dev` version of nf-core/tools (previous failure due to base image version)
26+
* Lint code no longer tries to post GitHub PR comments. This is now done in a GitHub Action only.
27+
328
## [v1.11 - Iron Tiger](https://github.com/nf-core/tools/releases/tag/1.11) - [2020-10-27]
429

530
### Template

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ $ nf-core lint .
478478
│ [!] 3 Test Warnings │
479479
├──────────────────────────────────────────────────────────────────────────────────────────────────────────┤
480480
│ https://nf-co.re/errors#5: GitHub Actions AWS full test should test full datasets: nf-core-testpipeline… │
481-
│ https://nf-co.re/errors#8: Conda package is not latest available: bioconda::fastqc=0.11.8, 0.11.9 avail…
482-
│ https://nf-co.re/errors#8: Conda package is not latest available: bioconda::multiqc=1.7, 1.9 available │
481+
│ https://nf-co.re/errors#8: Conda dep outdated: bioconda::fastqc=0.11.8, 0.11.9 available
482+
│ https://nf-co.re/errors#8: Conda dep outdated: bioconda::multiqc=1.7, 1.9 available
483483
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────╯
484484
╭───────────────────────╮
485485
│ LINT RESULTS SUMMARY │

docs/api/_src/bump_version.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ nf_core.bump_version
22
====================
33

44
.. automodule:: nf_core.bump_version
5-
:members:
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:
8+
:private-members:

0 commit comments

Comments
 (0)