-
Notifications
You must be signed in to change notification settings - Fork 828
Dev -> Master for 3.20.0 #1593
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
Merged
Dev -> Master for 3.20.0 #1593
Changes from all commits
Commits
Show all changes
105 commits
Select commit
Hold shift + click to select a range
5a7079c
back to dev + nft-utils 0.0.4
maxulysse e555276
update CHANGELOG
maxulysse c396509
update CHANGELOG
maxulysse 302669a
Merge pull request #1568 from maxulysse/back_to_dev
maxulysse 952696c
ignore umi_dedup.transcriptome.sorted.log, only umi_dedup.sorted.log
idot 58e7357
changelog
idot 4d8ff15
changelog PR# correct
idot 27673fb
[GH-1572] Fix salmon.merged.SummarizedExperiment.rds name collision
GallVp 330c0ea
Updated changelog
GallVp 11e1a15
Template update for nf-core/tools version 3.3.2
nf-core-bot 4579dbf
Update awsfulltest.yml to restore aligner-wise output
pinin4fjords d7f8104
Update CHANGELOG.md
pinin4fjords 00eb779
Merge branch 'dev' into restore_aligner_testfull_output
pinin4fjords 96fb040
Poke CI
pinin4fjords 93452bc
Merge pull request #1585 from nf-core/restore_aligner_testfull_output
pinin4fjords 807fd19
install sentieon/staralign
FriederikeHanssen 7636eb6
add args to sentieon_align_star
FriederikeHanssen c02c684
add sentieon secrets to ci
FriederikeHanssen 8c8599d
add sentieon secrets
FriederikeHanssen 82c38be
revert changes from schema builder
FriederikeHanssen fddcc5b
snapshots
FriederikeHanssen a4dace5
add auth_mech env var
FriederikeHanssen f4f5a18
sentieon star uses old style args
FriederikeHanssen 7cc752e
Merge branch 'dev' into nf-core-template-merge-3.3.2
maxulysse 806ef68
pre-commit
maxulysse 06d2c07
forgot merge conflicts
maxulysse 1f044f5
add more env vars
FriederikeHanssen f8f79b2
update nft-utils
maxulysse 9f2f8ce
fix versions checksum
FriederikeHanssen 05f43c3
update snapshot
maxulysse be418ff
update CHANGELOG
maxulysse a068046
update all snap
maxulysse 9598559
salmon_deseq2_clustering and salmon_deseq2_pca
maxulysse 38b285e
star_salmon_deseq2_clustering and star_salmon_deseq2_pca
maxulysse 8522d1f
Update tests/.nftignore
maxulysse fae2eeb
restore snap
maxulysse 8b725ca
Merge pull request #1580 from nf-core/nf-core-template-merge-3.3.2
maxulysse 9452604
Merge branch 'dev' into add_sentieon_star
FriederikeHanssen fc3cab4
fix version
FriederikeHanssen 0799db8
snapshots
FriederikeHanssen ff9b53a
refactor code since sentieon star uses same syntax as igenomes star
FriederikeHanssen e0351a6
add license usage docs
FriederikeHanssen 411645c
update changelog
FriederikeHanssen f96bdc7
add complete pipeline test with sentieon
FriederikeHanssen 6163917
checksum order
FriederikeHanssen 752e85d
test out symlinking sentieon star in rsem
FriederikeHanssen 476d022
add tests for symlinking star in rsem
FriederikeHanssen 26703b9
add sentieon env vars to subworkflow test
FriederikeHanssen c3ff26a
update version chcksum
FriederikeHanssen a6958f5
add stub test
FriederikeHanssen 679d699
add pipeline level test
FriederikeHanssen f55fccc
add sentieon license vars to pipeline level tests
FriederikeHanssen 5be778d
replace local module with nf-core module
FriederikeHanssen 59978b6
update module name in configs
FriederikeHanssen 17b525d
add sentieon support for prepare_genome
FriederikeHanssen 004e8ea
update README with reference to sentieon for STAR
FriederikeHanssen d17cafc
add subworkflow level tests
FriederikeHanssen c8122ee
add snapshots
FriederikeHanssen 3a09fc4
fix test names in snapshots
FriederikeHanssen b0e7744
update rocrate
FriederikeHanssen dfc56ee
quotes
FriederikeHanssen af42ef3
add config for sentieon rsem_prepare
FriederikeHanssen 62cde8b
add maketranscript refs
FriederikeHanssen 5445d6d
fix mixed checksums
FriederikeHanssen 54f20dc
Merge branch 'dev' into fix/1572
pinin4fjords f4c6058
Merge branch 'dev' into mqc_umitools_genomic_only
pinin4fjords 88e05e4
remove excess whitespace
pinin4fjords a6264b2
Merge pull request #1573 from GallVp/fix/1572
pinin4fjords 4536e45
Merge branch 'dev' into mqc_umitools_genomic_only
pinin4fjords 00364d0
Merge pull request #1571 from idot/mqc_umitools_genomic_only
pinin4fjords 3bc2151
Merge branch 'dev' into add_sentieon_star
maxulysse ddfbee8
Apply suggestions from code review
FriederikeHanssen d0c7eba
move license script to .github.actions
FriederikeHanssen 43abdc7
fix comment alignment
FriederikeHanssen 9450a5c
rename use_sentieon to use_sentieon_star
FriederikeHanssen 9e00a4d
test process name reassignment
FriederikeHanssen 74f7d4d
test renaming
FriederikeHanssen 107f668
revert process renaming tests
FriederikeHanssen 5f45235
assign output name
FriederikeHanssen 3cf1b7b
Address reviews from @pinin4fjords & reduce one level of if statements
FriederikeHanssen c0bfbd2
add link to modules tested to address review by @edmundmiller
FriederikeHanssen e81774e
simplify logic
FriederikeHanssen 9c108af
clean up code
FriederikeHanssen b33be90
fix syntax error
FriederikeHanssen 195550b
propagate changes from #1573 to a number of other tests
FriederikeHanssen d6d32cb
set multi_channel initialisation to null
FriederikeHanssen fda153f
fix order
FriederikeHanssen f228324
more odering
FriederikeHanssen 75ded6e
Merge pull request #1590 from nf-core/add_sentieon_star
FriederikeHanssen 0a3f20b
update changelog
FriederikeHanssen ba216f4
Consistent naming for summarizedexperiment outputs
pinin4fjords d4fed11
Should be a minor release
pinin4fjords 03f105e
Fix multiqc config
pinin4fjords 9f1c33f
prettier
pinin4fjords 5497960
Fix orderings
pinin4fjords 6bf3f92
More sorting fixes
pinin4fjords ecf013d
Hopefully last sort fix
pinin4fjords eabd4b0
Fix version in nextflow.config
pinin4fjords 06a78fb
Merge pull request #1592 from nf-core/prep_release
pinin4fjords 767a9cc
Exclude unstable star_rsem PCAs from snaps
pinin4fjords a0894b4
Update changelog
pinin4fjords 18fd3e8
Merge pull request #1594 from nf-core/exclude_star_rsem_pca_from_snaps
maxulysse 4892865
Exclude unstable star_rsem clusterings from snaps
pinin4fjords b249b2f
Update changelog
pinin4fjords eb070e1
Merge pull request #1595 from nf-core/exclude_star_rsem_clustering_fr…
maxulysse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| #!/usr/bin/env python3 | ||
|
|
||
| ######################################### | ||
| # Author: [DonFreed](https://github.com/DonFreed) | ||
| # File: license_message.py | ||
| # Source: https://github.com/DonFreed/docker-actions-test/blob/main/.github/scripts/license_message.py | ||
| # Source+commit: https://github.com/DonFreed/docker-actions-test/blob/aa1051a9f53b3a1e801953748d062cad74dca9a9/.github/scripts/license_message.py | ||
| # Download Date: 2023-07-04, commit: aa1051a | ||
| # This source code is licensed under the BSD 2-Clause license | ||
| ######################################### | ||
|
|
||
| """ | ||
| Functions for generating and sending license messages | ||
| """ | ||
|
|
||
| # Modified from - https://stackoverflow.com/a/59835994 | ||
|
|
||
| import argparse | ||
| import base64 | ||
| import calendar | ||
| import re | ||
| import secrets | ||
| import sys | ||
|
|
||
| from cryptography.hazmat.primitives.ciphers.aead import AESGCM | ||
| from datetime import datetime as dt | ||
|
|
||
| MESSAGE_TIMEOUT = 60 * 60 * 24 # Messages are valid for 1 day | ||
| NONCE_BYTES = 12 | ||
|
|
||
|
|
||
| class DecryptionTimeout(Exception): | ||
| # Decrypting a message that is too old | ||
| pass | ||
|
|
||
|
|
||
| def generate_key(): | ||
| key = secrets.token_bytes(32) | ||
| return key | ||
|
|
||
|
|
||
| def handle_generate_key(args): | ||
| key = generate_key() | ||
| key_b64 = base64.b64encode(key) | ||
| print(key_b64.decode("utf-8"), file=args.outfile) | ||
|
|
||
|
|
||
| def encrypt_message(key, message): | ||
| nonce = secrets.token_bytes(NONCE_BYTES) | ||
| timestamp = calendar.timegm(dt.now().utctimetuple()) | ||
| data = timestamp.to_bytes(10, byteorder="big") + b"__" + message | ||
| ciphertext = nonce + AESGCM(key).encrypt(nonce, data, b"") | ||
| return ciphertext | ||
|
|
||
|
|
||
| def handle_encrypt_message(args): | ||
| key = base64.b64decode(args.key.encode("utf-8")) | ||
| message = args.message.encode("utf-8") | ||
| ciphertext = encrypt_message(key, message) | ||
| ciphertext_b64 = base64.b64encode(ciphertext) | ||
| print(ciphertext_b64.decode("utf-8"), file=args.outfile) | ||
|
|
||
|
|
||
| def decrypt_message(key, ciphertext, timeout=MESSAGE_TIMEOUT): | ||
| nonce, ciphertext = ciphertext[:NONCE_BYTES], ciphertext[NONCE_BYTES:] | ||
| message = AESGCM(key).decrypt(nonce, ciphertext, b"") | ||
|
|
||
| msg_timestamp, message = re.split(b"__", message, maxsplit=1) | ||
| msg_timestamp = int.from_bytes(msg_timestamp, byteorder="big") | ||
| timestamp = calendar.timegm(dt.now().utctimetuple()) | ||
| if (timestamp - msg_timestamp) > timeout: | ||
| raise DecryptionTimeout("The message has an expired timeout") | ||
| return message.decode("utf-8") | ||
|
|
||
|
|
||
| def handle_decrypt_message(args): | ||
| key = base64.b64decode(args.key.encode("utf-8")) | ||
| ciphertext = base64.b64decode(args.message.encode("utf-8")) | ||
| message = decrypt_message(key, ciphertext, timeout=args.timeout) | ||
| print(str(message), file=args.outfile) | ||
|
|
||
|
|
||
| def parse_args(argv=None): | ||
| parser = argparse.ArgumentParser(description=__doc__) | ||
| parser.add_argument("--outfile", default=sys.stdout, type=argparse.FileType("w"), help="The output file") | ||
|
|
||
| subparsers = parser.add_subparsers(help="Available sub-commands") | ||
|
|
||
| gen_parser = subparsers.add_parser("generate_key", help="Generate a random key string") | ||
| gen_parser.set_defaults(func=handle_generate_key) | ||
|
|
||
| encrypt_parser = subparsers.add_parser("encrypt", help="Encrypt a message") | ||
| encrypt_parser.add_argument("--key", required=True, help="The encryption key") | ||
| encrypt_parser.add_argument("--message", required=True, help="Message to encrypt") | ||
| encrypt_parser.set_defaults(func=handle_encrypt_message) | ||
|
|
||
| decrypt_parser = subparsers.add_parser("decrypt", help="Decyrpt a message") | ||
| decrypt_parser.add_argument("--key", required=True, help="The encryption key") | ||
| decrypt_parser.add_argument("--message", required=True, help="Message to decrypt") | ||
| decrypt_parser.add_argument( | ||
| "--timeout", | ||
| default=MESSAGE_TIMEOUT, | ||
| type=int, | ||
| help="A message timeout. Decryption will fail for older messages", | ||
| ) | ||
| decrypt_parser.set_defaults(func=handle_decrypt_message) | ||
|
|
||
| return parser.parse_args(argv) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| args = parse_args() | ||
| args.func(args) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to nitpick, at what point does this pipeline become not 'authored' by these three people?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For me, these are the historic authors.
The contributors list in the manifest in the
nextflow.config, reflects everyone.And the author key has even been removed.
Also this author list has been replaced by
the nf-core/rnaseq teamin theLICENSEfile.For me, this list in this file, is just a remnant and is due to disappear in future TEMPLATE update.
@mirpedrol could probably confirm if I'm right or not
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But the Credits section of the README could get an update, as I believe @pinin4fjords to be the true maintainer of this pipeline.
As I'm now in charge of this release since Jon is away, I'll let it slide and we'll make sure to update this later.
Thanks for nitpicking.
I do believe it's important to properly credit people for their work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This value should contain the same names that are listed in
contributorswith the contribution "author", in the manifest ofnextflow.config. In fact, when we generate the pipeline from the template we use this to populate the contributors field.If these names in particular should be listed as authors is a different discussion. To me, authors are the original authors, and can include others if they have contributed significantly (for example on a pipeline rewrite, etc.). But maybe we could discuss this within core-team or maintainers.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I think this could do with a discussion.