Skip to content

Commit

Permalink
Merge pull request #57 from phac-nml/allele
Browse files Browse the repository at this point in the history
Allele
  • Loading branch information
chadlaing authored Jul 4, 2018
2 parents 38069b9 + ad6af3d commit e7cec06
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: python
python:
- "3.6"
- "3.5"
before_install:
- sudo apt-get update
install:
Expand All @@ -14,7 +14,7 @@ install:
- conda info -a
- conda config --add channels bioconda
- conda config --add channels conda-forge
- conda create -q -n test-environment python=3.6 samtools>=1.7 pandas>=0.23 bowtie2>=2.3 mash>=2 bcftools>=1.7 biopython>=1.69 blast>=2.2.31 seqtk>=1.2 pytest>=3.6
- conda create -q -n test-environment python=3.5 samtools>=1.7 pandas>=0.23 bowtie2>=2.3 mash>=2 bcftools>=1.7 biopython>=1.69 blast>=2.2.31 seqtk>=1.2 pytest>=3.5
- conda activate test-environment
- python setup.py install

Expand Down
2 changes: 1 addition & 1 deletion ectyper/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.5.1"
__version__ = "0.5.3"
2 changes: 1 addition & 1 deletion ectyper/ectyper.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def run_program():
LOG.info("Reporting results:\n")

predictionFunctions.report_result(final_predictions, os.path.join(output_directory, 'output.csv'))
LOG.info("\nECTYper has finished successfully.")
LOG.info("\nECTyper has finished successfully.")


def create_output_directory(output_dir):
Expand Down
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ build:

requirements:
build:
- python >=3.6
- python >=3.5
- skip: True # [not py35]

run:
- python >=3.6
- pytest >=3.6
- python >=3.5
- pytest >=3.5
- pandas >=0.23
- samtools >=1.7
- bowtie2 >=2.3
Expand Down

0 comments on commit e7cec06

Please sign in to comment.