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 3.17.0 #1433

Merged
merged 107 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
e9fa18c
Merge pull request #1417 from nf-core/master
maxulysse Oct 16, 2024
dca14c5
Bump versions back to 3.17.0 after release
pinin4fjords Oct 16, 2024
4336b2b
Update CHANGELOG
pinin4fjords Oct 16, 2024
f919609
Prettier
pinin4fjords Oct 16, 2024
5f2badc
Merge pull request #1418 from nf-core/postrelease_3.16.1
pinin4fjords Oct 16, 2024
d59ecf7
appy changes for ARM
pabloaledo May 16, 2024
991637c
Merge branch 'arm_3.16.1' into dev
pinin4fjords Oct 17, 2024
4bdae48
Fix up config
pinin4fjords Oct 17, 2024
c9d616b
Reset environment ymls
pinin4fjords Oct 17, 2024
9f640ab
Reset main.nfs with software changes only
pinin4fjords Oct 17, 2024
00cff4c
Link sw configs to arm profile
pinin4fjords Oct 17, 2024
f281e0b
Add process block
pinin4fjords Oct 17, 2024
f5208dd
note pins
pinin4fjords Oct 17, 2024
ea8b9e8
Remove conda overrides that were having no impact
pinin4fjords Oct 17, 2024
db02d99
Use different RSEQC pin
pinin4fjords Oct 18, 2024
4a8ed2b
update BEDGRAPHTOBIGWIG pin
pinin4fjords Oct 18, 2024
b86a6f9
Fix annotation
pinin4fjords Oct 18, 2024
1b96eb8
Don't think we need the RSEQC pin
pinin4fjords Oct 18, 2024
4e5d7a3
correct ucsc
pinin4fjords Oct 18, 2024
bbd3452
Merge pull request #1 from pinin4fjords/sw_to_conf
pabloaledo Oct 18, 2024
902367e
Triage arm deps
pinin4fjords Oct 18, 2024
328d02d
Non-igenomes STAR can use the latest star
pinin4fjords Oct 18, 2024
2f92bfc
remove rogue comment
pinin4fjords Oct 18, 2024
0a563dc
update arm conf
pinin4fjords Oct 21, 2024
8a3b58f
Bump lots of modules so that conda versions have arm builds
pinin4fjords Oct 21, 2024
6739fbd
Update prepare_genome snaps
pinin4fjords Oct 21, 2024
75fad6f
Update align_star snaps
pinin4fjords Oct 21, 2024
a036f5d
Update quantify_rsem snaps
pinin4fjords Oct 21, 2024
5dd65b9
[skip ci] First batch of pipeline test updates
pinin4fjords Oct 21, 2024
7568b2d
[skip ci] Update subworkflow snaps due to patch on module
pinin4fjords Oct 21, 2024
c3e0618
[skip ci] bump remove_ribo_rna snaps
pinin4fjords Oct 21, 2024
aa01883
Merge branch 'bump_modules_for_arm' of https://github.com/nf-core/rna…
pinin4fjords Oct 21, 2024
206c792
[skip ci] Update snaps for --pseudo_aligner salmon --skip_qc --skip_a…
pinin4fjords Oct 21, 2024
9f9c8b1
[skip ci] update star_rsem pipeline snaps
pinin4fjords Oct 21, 2024
e52596b
Merge branch 'bump_modules_for_arm' of https://github.com/nf-core/rna…
pinin4fjords Oct 21, 2024
102dc63
[skip ci] update pipeline tests for skip_qc
pinin4fjords Oct 21, 2024
5508eb6
Merge branch 'bump_modules_for_arm' of https://github.com/nf-core/rna…
pinin4fjords Oct 21, 2024
a9dc3dd
update skip_trimming snaps
pinin4fjords Oct 21, 2024
787ab18
update changelog
pinin4fjords Oct 21, 2024
13d384c
Revert hisat diff
pinin4fjords Oct 21, 2024
9078e0f
remove excess newlines
pinin4fjords Oct 21, 2024
a97256b
Merge pull request #1422 from nf-core/bump_modules_for_arm
pinin4fjords Oct 21, 2024
a7983ec
Bump star modules
pinin4fjords Oct 21, 2024
f99460d
Update option for new STAR
pinin4fjords Oct 21, 2024
ce7486b
Fix up pipeline tests
pinin4fjords Oct 21, 2024
7116a9a
Fix local star swf to match star
pinin4fjords Oct 21, 2024
5cb8974
update changelog
pinin4fjords Oct 21, 2024
10b67df
Merge pull request #1423 from nf-core/bump_star
pinin4fjords Oct 22, 2024
1b8efca
patch sortmerna to 4.3.7 in seqera channel pending a functional veris…
pinin4fjords Oct 22, 2024
d1ff982
Update changelog
pinin4fjords Oct 22, 2024
7b56c84
fix sortmerna tests for order
pinin4fjords Oct 22, 2024
82dfdf2
update a relevant pipeline test
pinin4fjords Oct 22, 2024
3671d59
Merge pull request #1424 from nf-core/bump_sortmerna
pinin4fjords Oct 22, 2024
0be2d6a
Cut out module redundant software overrides
pinin4fjords Oct 22, 2024
bba6b92
Merge pull request #2 from pinin4fjords/triage_arm
pabloaledo Oct 22, 2024
56f1a47
Merge pull request #1414 from pabloaledo/dev
pinin4fjords Oct 22, 2024
a5e831f
Merge branch 'dev' into arm_3.16.1
pinin4fjords Oct 22, 2024
ed026be
Add frozen ARM builds
pinin4fjords Oct 22, 2024
a8d514f
Container directives for conda overrides
pinin4fjords Oct 22, 2024
8e14711
Temporary Trimgalore override, singularity fixes for rsem processes
pinin4fjords Oct 22, 2024
161cf95
update docs
pinin4fjords Oct 22, 2024
caad7fa
Fix argument conflict between STAR versions
pinin4fjords Oct 22, 2024
cdfb98b
Fix config error
pinin4fjords Oct 22, 2024
524e19e
Correction to star rsem
pinin4fjords Oct 22, 2024
7448aed
Merge branch 'arm_3.16.1' of github.com:nf-core/rnaseq into arm_3.16.1
pinin4fjords Oct 22, 2024
4f8de94
Refine config setup
pinin4fjords Oct 22, 2024
a1d558e
Bump trimgalore module
pinin4fjords Oct 22, 2024
dae2899
Fix up ARM profile for updated trim-galore
pinin4fjords Oct 22, 2024
d3580a4
Apply suggestions from code review
pinin4fjords Oct 23, 2024
32f7d32
Apply suggestions from code review
pinin4fjords Oct 23, 2024
7df162f
Add notes for kraken2/ braken
pinin4fjords Oct 23, 2024
642d2a8
Update docs
pinin4fjords Oct 23, 2024
d9e534d
prettier
pinin4fjords Oct 23, 2024
d4fcb56
lint fix
pinin4fjords Oct 23, 2024
896dd74
[skip ci] Reorg ARM bits
pinin4fjords Oct 23, 2024
314ea85
Update arm.config
drpatelh Oct 23, 2024
251481f
Fix syntax error
pinin4fjords Oct 23, 2024
cde5fef
Merge branch 'arm_3.16.1' of github.com:nf-core/rnaseq into arm_3.16.1
pinin4fjords Oct 23, 2024
f59132a
revert trimgalore tweak to appease linter
pinin4fjords Oct 23, 2024
40f05c5
Update pipeline-level tests
pinin4fjords Oct 23, 2024
2156f5d
Merge branch 'arm_3.16.1' of https://github.com/nf-core/rnaseq into a…
pinin4fjords Oct 23, 2024
79370d3
Update CHANGELOG
pinin4fjords Oct 23, 2024
424137a
Merge branch 'arm_3.16.1' of github.com:nf-core/rnaseq into arm_3.16.1
pinin4fjords Oct 23, 2024
fb057c9
Merge pull request #1425 from nf-core/arm_3.16.1
pinin4fjords Oct 23, 2024
9b9181c
Bump versions
pinin4fjords Oct 23, 2024
62f4ffe
update changelog
pinin4fjords Oct 23, 2024
facaabd
Merge pull request #1432 from nf-core/prerelease_3.17.0
pinin4fjords Oct 23, 2024
2a50999
update CHANGELOG
maxulysse Oct 23, 2024
4316615
update and patch modules
maxulysse Oct 23, 2024
434f0b7
Merge pull request #1434 from maxulysse/default_registry_no_exception
maxulysse Oct 23, 2024
e94558b
update CHANGELOG
maxulysse Oct 23, 2024
b5f530f
fix CI
maxulysse Oct 23, 2024
f389d0f
Merge branch 'dev' into CHANGELOG
maxulysse Oct 23, 2024
97d3697
update CHANGELOG
maxulysse Oct 23, 2024
23d3ee7
fix GHA
maxulysse Oct 23, 2024
b55c81a
revert GHA
maxulysse Oct 23, 2024
9690d29
revert CHANGELOG
maxulysse Oct 23, 2024
ac1b7e0
update CHANGELOG
maxulysse Oct 23, 2024
3890344
remove conda from matrix
maxulysse Oct 23, 2024
1c5d267
Merge pull request #1437 from maxulysse/CHANGELOG
pinin4fjords Oct 23, 2024
a0ee0b3
further reduce down the matrix
maxulysse Oct 24, 2024
b78e15a
update CHANGELOG
maxulysse Oct 24, 2024
14e7677
force convert for some singularity images
maxulysse Oct 24, 2024
73b5488
Merge pull request #1440 from maxulysse/reduce_matrix
maxulysse Oct 24, 2024
28dac89
Merge branch 'dev' into fix_download
maxulysse Oct 24, 2024
cb5cc2c
update CHANGELOG
maxulysse Oct 24, 2024
8cddc95
Merge pull request #1441 from maxulysse/fix_download
maxulysse Oct 24, 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
40 changes: 2 additions & 38 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,37 +54,16 @@ jobs:
- "latest-everything"
nf_test_files: ["${{ fromJson(needs.nf-test-changes.outputs.nf_test_files) }}"]
profile:
- "conda"
- "docker"
- "singularity"
isMaster:
- ${{ github.base_ref == 'master' }}
# Exclude conda and singularity on dev
exclude:
- isMaster: false
profile: "conda"
- isMaster: false
profile: "singularity"
- profile: "conda"
nf_test_files: "tests/default.nf.test"
- profile: "conda"
nf_test_files: "tests/featurecounts_group_type.nf.test"
- profile: "conda"
nf_test_files: "tests/hisat2.nf.test"
- profile: "conda"
nf_test_files: "tests/kallisto.nf.test"
- profile: "conda"
nf_test_files: "tests/min_mapped_reads.nf.test"
- profile: "conda"
nf_test_files: "tests/remove_ribo_rna.nf.test"
- profile: "conda"
nf_test_files: "tests/salmon.nf.test"
- profile: "conda"
nf_test_files: "tests/skip_qc.nf.test"
- profile: "conda"
nf_test_files: "tests/skip_trimming.nf.test"
- profile: "conda"
nf_test_files: "tests/star_rsem.nf.test"
- NXF_VER: "latest-everything"
profile: "singularity"
steps:
- name: Check out pipeline code
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
Expand All @@ -104,21 +83,6 @@ jobs:
mkdir -p $NXF_SINGULARITY_CACHEDIR
mkdir -p $NXF_SINGULARITY_LIBRARYDIR

- name: Set up Miniconda
if: matrix.profile == 'conda'
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3
with:
miniconda-version: "latest"
auto-update-conda: true
conda-solver: libmamba
channels: conda-forge,bioconda

- name: Set up Conda
if: matrix.profile == 'conda'
run: |
echo $(realpath $CONDA)/condabin >> $GITHUB_PATH
echo $(realpath python) >> $GITHUB_PATH

- name: Install nf-test
uses: nf-core/setup-nf-test@v1
with:
Expand Down
54 changes: 54 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,60 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [[3.17.0](https://github.com/nf-core/rnaseq/releases/tag/3.17.0)] - 2024-10-23

### Credits

Special thanks to the following for their contributions to the release:

- [Maxime Garcia](https://github.com/maxulysse)
- [Jonathan Manning](https://github.com/pinin4fjords)
- [Pablo Gonzalez de Aledo](https://github.com/pabloaledo)

### Enhancements & fixes

- [PR #1418](https://github.com/nf-core/rnaseq/pull/1418) - Bump versions back to 3.17.0 after release
- [PR #1422](https://github.com/nf-core/rnaseq/pull/1422) - Bump lots of modules so that conda versions have ARM builds
- [PR #1423](https://github.com/nf-core/rnaseq/pull/1423) - Bump STAR version for version with ARM Conda build
- [PR #1424](https://github.com/nf-core/rnaseq/pull/1424) - Patch sortmerna to 4.3.7 for ARM compatibility
- [PR #1425](https://github.com/nf-core/rnaseq/pull/1425) - Add profile for ARM compatibility
- [PR #1432](https://github.com/nf-core/rnaseq/pull/1432) - Bump versions for 3.17.0 release
- [PR #1434](https://github.com/nf-core/rnaseq/pull/1434) - Default registry is quay.io for all containers
- [PR #1437](https://github.com/nf-core/rnaseq/pull/1437) - Update software dependencies
- [PR #1437](https://github.com/nf-core/rnaseq/pull/1437) - Remove conda from test matrix
- [PR #1440](https://github.com/nf-core/rnaseq/pull/1440) - Further reduce matrix
- [PR #1441](https://github.com/nf-core/rnaseq/pull/1441) - Force some containers to be converted from docker to singularity to fix nf-core download tests

### Software dependencies

| Dependency | Old version | New version |
| ----------------------------- | ----------- | ----------- |
| `bbmap` | 39.01 | 39.10 |
| `coreutils` | 8.30 | 9.5 |
| `fq` | 0.9.1 | 0.12.0 |
| `python (catadditionalfasta)` | 3.9.5 | 3.12.2 |
| `python (tx2gene)` | 3.9.5 | 3.10.4 |
| `cutadapt` | 3.4 | 4.9 |
| `htslib (star)` | 1.18 | 1.20 |
| `htslib` | 1.20 | 1.21 |
| `kallisto` | 0.48.0 | 0.51.1 |
| `preseq` | 3.1.2 | 3.2.0 |
| `salmon` | 1.10.1 | 1.10.3 |
| `samtools (star)` | 1.18 | 1.20 |
| `samtools` | 1.20 | 1.21 |
| `sortmerna` | 4.3.6 | 4.3.7 |
| `star` | 2.7.10a | =2.7.11b |
| `stringtie` | 2.2.1 | 2.2.3 |
| `subread` | 2.0.1 | 2.0.6 |
| `trim-galore` | 0.6.7 | 0.6.10 |
| `ucsc-bedgraphtobigwig` | 445 | 469 |

> **NB:** Dependency has been **updated** if both old and new version information is present.
>
> **NB:** Dependency has been **added** if just the new version information is present.
>
> **NB:** Dependency has been **removed** if new version information isn't present.

## [[3.16.1](https://github.com/nf-core/rnaseq/releases/tag/3.16.1)] - 2024-10-16

### Credits
Expand Down
Loading
Loading