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

Merge mentalist_v0.2 into master #76

Merged
merged 20 commits into from
Jul 26, 2018
Merged

Merge mentalist_v0.2 into master #76

merged 20 commits into from
Jul 26, 2018

Conversation

dfornika
Copy link
Contributor

Preventing master and mentalist_v0.2 branches from diverging by merging mentalist_v0.2 into master.

dfornika and others added 17 commits March 24, 2018 13:12
* new script to filter Mentalist flag symbols from the calls

* Add .travis.yml file (#18)

* Added travis.yml file

* Added 'Build Status' badge

* Update .travis.yml

* Update requirements for TravisCI testing

* kmer_class_for_locus function no longer exists

* Don't test on OS X

* Added coverage badge.

* Updated macOS install instructions

* Updated macOS install instructions

* Update README.md

* Update runtests.jl

* TravisCI testing on v0.5 is broken.

* Added <edam_operation> tag to 'mentalist call' galaxy tool (#21)

* fixed a bug in the cgmlst download, fasta file decompression could be incorrect in some cases

* adding import JSON; was not needed before because some other library was probably loading it, but for the tests we need this explicitly

* new messages while loading a kmer db, better idea of how much each large step takes

* lots of new unit tests and a new fastq testing file. Coverage should be much higher now.

* Change version info for galaxy tools in master branch to 'master'

* support for analysing multiple samples

* reorganizing the argparse code and a bit of refactoring

* adding all multi-sample functionality; better output for novel alleles; parallel downloading for enterobase

* small adjustment on a test

* Fix c_jejuni_fastq_file filename in test

* Adjusted kmer & vote numbers to match smaller test file.

* Update conda recipe

* Don't convert fasta_files paths to absolute paths (#23)

* Don't convert fasta_files paths to absolute paths

* Prepend database directory path on to relative paths for allele fasta files in db

* Don't create db_path variable, check for existence of fasta files

* Tidy up newlines

* Added test to check MLST calling after moving a database

* Relative paths in db (#25)

* Don't convert fasta_files paths to absolute paths

* Prepend database directory path on to relative paths for allele fasta files in db

* Don't create db_path variable, check for existence of fasta files

* Tidy up newlines

* Added test to check MLST calling after moving a database

* Fixed issue with scheme fasta loading during calling
* new script to filter Mentalist flag symbols from the calls

* Add .travis.yml file (#18)

* Added travis.yml file

* Added 'Build Status' badge

* Update .travis.yml

* Update requirements for TravisCI testing

* kmer_class_for_locus function no longer exists

* Don't test on OS X

* Added coverage badge.

* Updated macOS install instructions

* Updated macOS install instructions

* Update README.md

* Update runtests.jl

* TravisCI testing on v0.5 is broken.

* Added <edam_operation> tag to 'mentalist call' galaxy tool (#21)

* fixed a bug in the cgmlst download, fasta file decompression could be incorrect in some cases

* adding import JSON; was not needed before because some other library was probably loading it, but for the tests we need this explicitly

* new messages while loading a kmer db, better idea of how much each large step takes

* lots of new unit tests and a new fastq testing file. Coverage should be much higher now.

* Change version info for galaxy tools in master branch to 'master'

* support for analysing multiple samples

* reorganizing the argparse code and a bit of refactoring

* adding all multi-sample functionality; better output for novel alleles; parallel downloading for enterobase

* small adjustment on a test

* Fix c_jejuni_fastq_file filename in test

* Adjusted kmer & vote numbers to match smaller test file.

* Update conda recipe

* Don't convert fasta_files paths to absolute paths (#23)

* Don't convert fasta_files paths to absolute paths

* Prepend database directory path on to relative paths for allele fasta files in db

* Don't create db_path variable, check for existence of fasta files

* Tidy up newlines

* Added test to check MLST calling after moving a database

* Relative paths in db (#25)

* Don't convert fasta_files paths to absolute paths

* Prepend database directory path on to relative paths for allele fasta files in db

* Don't create db_path variable, check for existence of fasta files

* Tidy up newlines

* Added test to check MLST calling after moving a database

* Fixed issue with scheme fasta loading during calling
* Fork an unzip process to decompress downloaded cgMLST alleles

* Rewrite download_cgmlst_scheme() to handle new zip scheme files from cgmlst.org

* Tidy up comments and fix total locus count

* Fix test data filenames for L. pneumophila

* Add unzip as a conda dependency

* variable n_locus not used
* Update enterobase scheme download URL

* bump version number
@codecov-io
Copy link

codecov-io commented Jul 26, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@24ce145). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #76   +/-   ##
=========================================
  Coverage          ?   55.27%           
=========================================
  Files             ?        5           
  Lines             ?      863           
  Branches          ?        0           
=========================================
  Hits              ?      477           
  Misses            ?      386           
  Partials          ?        0
Impacted Files Coverage Δ
src/MentaLiST.jl 0% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 24ce145...3936705. Read the comment docs.

@dfornika dfornika merged commit 77ca273 into master Jul 26, 2018
@dfornika dfornika deleted the mentalist_v0.2 branch July 26, 2018 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants