Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev -> Master for 2.13.1 #2811

Merged
merged 59 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
7642616
bump version to 3.0dev
mirpedrol Feb 20, 2024
d36a503
update badges
maxulysse Feb 21, 2024
f48caff
add nf-test badge
maxulysse Feb 21, 2024
5602f95
fix typo
maxulysse Feb 21, 2024
aeab913
unit-tests
maxulysse Feb 21, 2024
e5d78f0
use jinja
maxulysse Feb 21, 2024
df699d1
Merge pull request #2783 from mirpedrol/bump-3.0dev
mashehu Feb 21, 2024
984b120
Merge branch 'dev' into template_update
mashehu Feb 21, 2024
ec13bfd
Merge pull request #2785 from maxulysse/template_update
mashehu Feb 21, 2024
15195a2
chore(deps): update seqeralabs/action-tower-launch digest to aa88624
renovate[bot] Feb 22, 2024
ef0b87b
[automated] Update CHANGELOG.md
nf-core-bot Feb 23, 2024
daa28ea
chore(deps): update codecov/codecov-action digest to 0cfda1d
renovate[bot] Feb 23, 2024
b0a268b
[automated] Update CHANGELOG.md
nf-core-bot Feb 24, 2024
a059e16
fix(devcontainer): remove deprecated linters
kenibrewer Feb 25, 2024
4052a02
copy changes over to template, update extensions in gitpod.yml
mashehu Feb 27, 2024
622601e
update changelog
mashehu Feb 27, 2024
f64d486
Merge pull request #2795 from kenibrewer/fix/remove-deprecated-linters
kenibrewer Feb 27, 2024
a0381de
Write a new helper function: gather_registries() to read the config.
MatthiasZepper Feb 16, 2024
6f83b61
nf-core download: Write function to symlink containers to different l…
MatthiasZepper Feb 16, 2024
80f2d34
Refactor: Always trim registry from output name. Naming collisions ar…
MatthiasZepper Feb 19, 2024
7954bcb
Modify the pytest.yml action such that Singularity is used for the nf…
MatthiasZepper Feb 20, 2024
5cfccd3
Extend ContainerError to match ghcr.io error message.
MatthiasZepper Feb 20, 2024
0817024
Add test_gather_registries() to test_download.py
MatthiasZepper Feb 21, 2024
d1fb738
Finally a comprehensive test for symlink_singularity_images()
MatthiasZepper Feb 21, 2024
5a3fa12
Changelog.
MatthiasZepper Feb 21, 2024
d1179a4
Apply @Aratz 's suggestions from code review
MatthiasZepper Feb 26, 2024
e3c7f5b
Improved the documentation of the singularity_image_filenames() funct…
MatthiasZepper Feb 26, 2024
dceb7b3
Added a test for the so far untested singularity_image_filenames() fu…
MatthiasZepper Feb 27, 2024
27e6f7e
Fixed a typo in the template
nvnieuwk Feb 27, 2024
9eb5d6e
Merge branch 'dev' into nvnieuwk-patch-1
nvnieuwk Feb 27, 2024
9d74eff
Merge pull request #2798 from nf-core/nvnieuwk-patch-1
nvnieuwk Feb 27, 2024
37f2651
chore(deps): update gitpod/workspace-base docker digest to c15ee2f
renovate[bot] Feb 26, 2024
145fa48
[automated] Update CHANGELOG.md
nf-core-bot Feb 27, 2024
e64f1a7
Added a few type hints and opened Pandoras box.
MatthiasZepper Feb 27, 2024
e064b76
Unpin pinned dependecies for tower actions
FriederikeHanssen Feb 28, 2024
c6bc426
[automated] Update CHANGELOG.md
nf-core-bot Feb 28, 2024
54c671d
add nf-test test instructions to contributing and PR template
sateeshperi Feb 28, 2024
f7d7f0b
update changelog
sateeshperi Feb 29, 2024
e11bbbb
Merge pull request #2807 from nf-core/feat/add-nf-test-run-debug-inst…
sateeshperi Feb 29, 2024
0bfaa16
bump version to 2.13.1 [skip changelog]
mashehu Feb 29, 2024
7084d40
fix changelog
mashehu Feb 29, 2024
c24b390
Merge pull request #2768 from MatthiasZepper/download_image_naming_issue
MatthiasZepper Feb 29, 2024
b6aeba5
Merge branch 'dev' into bump-version-2_13_1
mashehu Feb 29, 2024
9a8d74f
Merge pull request #2809 from mashehu/bump-version-2_13_1
mashehu Feb 29, 2024
8b2295b
Template: Fix topic extraction step for hashtags in toots
mashehu Feb 29, 2024
e69ed9b
Template: Update modules and subworkflows
mashehu Feb 29, 2024
149724b
fix md syntax in contributing
mashehu Feb 29, 2024
b30d765
only run automated changelog on PRs to dev
mashehu Feb 29, 2024
9a72c28
Merge pull request #2812 from mashehu/update-template-modules
mashehu Feb 29, 2024
73fc109
Merge branch 'dev' into fix-toot-hashtags
mashehu Feb 29, 2024
3725453
unpin setup-nextflow
mashehu Feb 29, 2024
11cb480
chore(deps): update actions/download-artifact digest to 87c5514
renovate[bot] Feb 26, 2024
8c153aa
chore(deps): update codecov/codecov-action digest to 54bcd87
renovate[bot] Feb 28, 2024
2280e76
Merge pull request #2806 from FriederikeHanssen/unpin
mashehu Feb 29, 2024
6499a61
Apply suggestions from code review
mashehu Feb 29, 2024
412a43c
Merge pull request #2813 from mashehu/fix-syntax-in-contributing
mashehu Feb 29, 2024
17b2b09
Generate new screengrabs with rich-codex
github-actions[bot] Feb 29, 2024
a04e5ed
Merge branch 'dev' into fix-toot-hashtags
mashehu Feb 29, 2024
d6b459c
Merge pull request #2810 from mashehu/fix-toot-hashtags
mashehu Feb 29, 2024
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
10 changes: 1 addition & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,7 @@
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"python.defaultInterpreterPath": "/opt/conda/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.formatting.autopep8Path": "/opt/conda/bin/autopep8",
"python.formatting.yapfPath": "/opt/conda/bin/yapf",
"python.linting.flake8Path": "/opt/conda/bin/flake8",
"python.linting.pycodestylePath": "/opt/conda/bin/pycodestyle",
"python.linting.pydocstylePath": "/opt/conda/bin/pydocstyle",
"python.linting.pylintPath": "/opt/conda/bin/pylint"
"python.defaultInterpreterPath": "/opt/conda/bin/python"
},

// Add the IDs of extensions you want installed when the container is created.
Expand Down
2 changes: 1 addition & 1 deletion .github/RELEASE_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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. Check the [pipeline health page](https://nf-co.re/pipeline_health) to make sure that all repos look sane (missing `TEMPLATE` branches etc)
4. Check that modules/subworkflows in tempalte are up to date with the latest releases
4. Check that modules/subworkflows in template are up to date with the latest releases
5. Create a PR to `dev` to bump the version in `CHANGELOG.md` and `setup.py` and change the gitpod container to `nfcore/gitpod:latest`.
6. Make sure all CI tests are passing!
7. Create a PR from `dev` to `master`
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/create-lint-wf/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:

# Set up Nextflow
- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1
with:
version: ${{ matrix.NXF_VER }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-test-lint-wf-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
pip install .

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1
with:
version: latest-everything

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-test-wf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
pip install .

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1
with:
version: ${{ matrix.NXF_VER }}

Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,18 @@ jobs:
sudo add-apt-repository --remove ppa:git-core/ppa
sudo apt install -y git

- name: Set up Singularity
if: ${{ matrix.test == 'test_download.py'}}
uses: eWaterCycle/setup-singularity@931d4e31109e875b13309ae1d07c70ca8fbc8537 # v7
with:
singularity-version: 3.8.3

- name: Get current date
id: date
run: echo "date=$(date +'%Y-%m')" >> $GITHUB_ENV

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1

- name: Look if nf-test is already installed and write to env variable
id: check-nftest
Expand Down Expand Up @@ -191,14 +197,14 @@ jobs:
mv .github/.coveragerc .

- name: Download all artifacts
uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4
uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4
mashehu marked this conversation as resolved.
Show resolved Hide resolved
- name: Run coverage
run: |
coverage combine --keep coverage*/.coverage*
coverage report
coverage xml

- uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4
with:
files: coverage.xml
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rich-codex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
cache-dependency-path: setup.py

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1

- name: Cache nf-test installation
id: cache-software
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sync template

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (airrflow)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (ampliseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (atacseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (bacass)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (bactmap)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (bamtofastq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (cageseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (callingcards)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (chipseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (circdna)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (circrna)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (clipseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (coproid)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (createpanelrefs)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (createtaxdb)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (crisprseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (cutandrun)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (datasync)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (demultiplex)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (detaxizer)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (diaproteomics)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (detaxizer)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (differentialabundance)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (diaproteomics)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (dualrnaseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (differentialabundance)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (dualrnaseq)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (eager)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (eager)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (epitopeprediction)

.github/workflows/sync.yml#L1

This run was manually canceled.

Check failure on line 1 in .github/workflows/sync.yml

View workflow job for this annotation

GitHub Actions / sync (epitopeprediction)

.github/workflows/sync.yml#L1

This run was manually canceled.
on:
release:
types: [published]
Expand Down Expand Up @@ -67,7 +67,7 @@
pip install .

- name: Install Nextflow
uses: nf-core/setup-nextflow@b9f764e8ba5c76b712ace14ecbfcef0e40ae2dd8 # v1
uses: nf-core/setup-nextflow@v1
with:
version: "latest-everything"

Expand Down
3 changes: 0 additions & 3 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ tasks:

vscode:
extensions: # based on nf-core.nf-core-extensionpack
- codezombiech.gitignore # Language support for .gitignore files
# - cssho.vscode-svgviewer # SVG viewer
- esbenp.prettier-vscode # Markdown/CommonMark linting and style checking for Visual Studio Code
- eamodio.gitlens # Quickly glimpse into whom, why, and when a line or code block was changed
- EditorConfig.EditorConfig # override user/workspace settings with settings found in .editorconfig files
- Gruntfuggly.todo-tree # Display TODO and FIXME in a tree view in the activity bar
- mechatroner.rainbow-csv # Highlight columns in csv files in different colors
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# nf-core/tools: Changelog

## [v2.13.1 - Tin Puppy Patch](https://github.com/nf-core/tools/releases/tag/2.13) - [2024-02-29]

### Template

- Remove obsolete editor settings in `devcontainer.json` and `gitpod.yml` ([#2795](https://github.com/nf-core/tools/pull/2795))
- Add nf-test test instructions to contributing and PR template ([#2807](https://github.com/nf-core/tools/pull/2807))
- Update modules and subworkflows in the template ([#2811](https://github.com/nf-core/tools/pull/2811))

mashehu marked this conversation as resolved.
Show resolved Hide resolved
### Download

- Improved offline container image resolution by introducing symlinks, fixes issues [#2751](https://github.com/nf-core/tools/issues/2751), [#2644](https://github.com/nf-core/tools/issues/2644) and [demultiplex#164](https://github.com/nf-core/demultiplex/issues/164): ([#2768](https://github.com/nf-core/tools/pull/2768))

### Linting

### Components

### General

- chore(deps): update seqeralabs/action-tower-launch digest to aa88624 ([#2793](https://github.com/nf-core/tools/pull/2793))
mashehu marked this conversation as resolved.
Show resolved Hide resolved
- chore(deps): update codecov/codecov-action digest to 0cfda1d ([#2794](https://github.com/nf-core/tools/pull/2794))
- chore(deps): update gitpod/workspace-base docker digest to c15ee2f ([#2799](https://github.com/nf-core/tools/pull/2799))
- Unpin dependencies ([#2806](https://github.com/nf-core/tools/pull/2806))
mashehu marked this conversation as resolved.
Show resolved Hide resolved
mashehu marked this conversation as resolved.
Show resolved Hide resolved

## [v2.13 - Tin Puppy](https://github.com/nf-core/tools/releases/tag/2.13) - [2024-02-20]

### Template
Expand Down
Loading
Loading