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.

Sign up for GitHub

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

Jump to bottom

Merging changes from master into dev and fixing tests #178

Merged
merged 14 commits into from
Feb 3, 2025
Merged

Merging changes from master into dev and fixing tests #178

merged 14 commits into from
Feb 3, 2025

Conversation

willbradshaw
Copy link
Contributor

Minor change to BLAST test output as expected, no other output changes.

willbradshaw and others added 14 commits January 28, 2025 13:36
@willbradshaw
Merge pull request #165 from naobservatory/dev
5ef6796 
Merge v2.7.0.0 to master
@harmonbhasin
New index uses virus-genomes-masked.fasta.gz instead of virus-genomes…
02f185b 
…-filtered.fasta.gz
@harmonbhasin
index-for-run-test.config was missing adapters param, and organized t…
b6f3199 
…he format to match index.config
@harmonbhasin
Updated the RUN workflow test to use the new index
4826062
@harmonbhasin
Forgot to update se test.
82f1d1c
@harmonbhasin
Updated run validation test with new index.
68b30aa
@harmonbhasin
Updated changelog to reflect change in run validation as well.
098f943
@harmonbhasin
Updated snapshot, and gold standard output.
9f08238
@willbradshaw
Merge pull request #174 from naobservatory/harmon_fix_fatal_index_bug
074e274 
Fixing fatal bug
@willbradshaw
Merge in new changes from master branch
9feadd3
@harmonbhasin
Updating pipeline version
96b786f
@willbradshaw
Fixing test failures from merge
1fe61dd
@willbradshaw
Merge pull request #177 from naobservatory/harmon_fix_pipeline_version
9490aab 
Updating pipeline version
@willbradshaw
Re-merged master
db459fe
harmonbhasin
harmonbhasin approved these changes Feb 3, 2025
View reviewed changes
Copy link
Collaborator

@harmonbhasin harmonbhasin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as the gold standard test files are regenerated, after merging, this should be fine.

test-data/gold-standard-results/bracken_reports_merged.tsv.gz Show resolved Hide resolved
@willbradshaw willbradshaw merged commit a97711a into dev Feb 3, 2025
4 checks passed
@willbradshaw willbradshaw deleted the will-merge-master branch February 3, 2025 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harmonbhasin harmonbhasin harmonbhasin approved these changes

Assignees

@harmonbhasin harmonbhasin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@willbradshaw @harmonbhasin