From 620aa4a7f63b01c97f8cbd66f7bee1e7d314b2bb Mon Sep 17 00:00:00 2001 From: John Lees Date: Mon, 10 Feb 2020 14:10:14 +0000 Subject: [PATCH] Fix no_sketchlib var Turn off Travis (using Azure pipelines now) --- .travis.yml | 33 --------------------------------- PopPUNK/__main__.py | 2 ++ README.md | 3 +-- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ae819ae7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: python -python: - - "3.6" -services: # to get matplotlib to work - - xvfb -install: - - sudo apt-get update - - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda config --add channels defaults - - conda config --add channels bioconda - - conda config --add channels conda-forge - - conda update -q conda - # Useful for debugging any issues with conda - - conda info -a - - - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip numpy mkl scipy python-dateutil pandas scikit-learn dendropy sharedmem numba matplotlib networkx mash hdbscan rapidnj pp-sketchlib - - source activate test-environment - - conda list - - python -m pip install --no-deps --ignore-installed . -before_script: # to get matplotlib to work - - "export DISPLAY=:99.0" -script: - - cd test && python run_test.py - -# blocklist -branches: - only: - - master - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ # tagged releases \ No newline at end of file diff --git a/PopPUNK/__main__.py b/PopPUNK/__main__.py index 23f0c5c8..a1880b85 100644 --- a/PopPUNK/__main__.py +++ b/PopPUNK/__main__.py @@ -15,6 +15,8 @@ from .models import * +from .sketchlib import no_sketchlib + from .network import fetchNetwork from .network import constructNetwork from .network import extractReferences diff --git a/README.md b/README.md index 23d76e66..571fe341 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # PopPUNK (POPulation Partitioning Using Nucleotide Kmers) [![Dev build Status](https://dev.azure.com/jlees/PopPUNK/_apis/build/status/johnlees.PopPUNK?branchName=master)](https://dev.azure.com/jlees/PopPUNK/_build/latest?definitionId=1&branchName=master) -[![Stable build Status](https://travis-ci.org/johnlees/PopPUNK.svg?branch=v1.1.7)](https://travis-ci.org/johnlees/PopPUNK/) [![Documentation Status](https://readthedocs.org/projects/poppunk/badge/?version=latest)](https://poppunk.readthedocs.io/) -[![PyPI version](https://badge.fury.io/py/poppunk.svg)](https://badge.fury.io/py/poppunk) [![Anaconda package](https://anaconda.org/bioconda/poppunk/badges/version.svg)](https://anaconda.org/bioconda/poppunk) +[![PyPI version](https://badge.fury.io/py/poppunk.svg)](https://badge.fury.io/py/poppunk) See our website: