diff --git a/.travis.yml b/.travis.yml index d681340c6e75f29fdb9308335b0a634332165793..c99940c62b6eedd6a0e3442b40fb85bd3bb0e8a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,12 @@ addons: install: - > conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION - numpy scipy nose pandas matplotlib mkl-service theano + numpy scipy nose pandas matplotlib mkl-service - source activate test-environment - - pip install tensorflow pypandoc pylint + - pip install tensorflow pypandoc pylint 'theano>=1.0.4' - pip install -r requirements.txt - pip install . - - pip install coveralls + - pip freeze env: global: - PYTHONHASHSEED=0 @@ -47,6 +47,5 @@ script: # download data and models, then run tests - mhcflurry-downloads fetch - mhcflurry-downloads info # just to test this command works - - nosetests test -sv --with-coverage --cover-package=mhcflurry && ./lint.sh -after_success: - coveralls + - nosetests test -sv + - ./lint.sh diff --git a/lint.sh b/lint.sh index 38b7859bf494fef4625d1b26649ea7bce0ea5caf..8db7876e33c55e976c0144cae033e58206fb3ce8 100755 --- a/lint.sh +++ b/lint.sh @@ -10,6 +10,6 @@ set -o errexit find . -name '*.py' -not -path "./docs/*" \ | xargs pylint \ --errors-only \ - --disable=unsubscriptable-object,not-an-iterable,no-member + --disable=unsubscriptable-object,not-an-iterable,no-member,assignment-from-no-return echo 'Passes pylint check' diff --git a/mhcflurry/downloads.py b/mhcflurry/downloads.py index ff318ec433ee2cc6cd5713f56ac4feab6f035c50..ec776f9e093c7309e5f06a54d0b35a52489d0d96 100644 --- a/mhcflurry/downloads.py +++ b/mhcflurry/downloads.py @@ -50,7 +50,7 @@ def get_downloads_metadata(): """ global _METADATA if _METADATA is None: - _METADATA = yaml.load(resource_string(__name__, "downloads.yml")) + _METADATA = yaml.safe_load(resource_string(__name__, "downloads.yml")) return _METADATA diff --git a/mhcflurry/version.py b/mhcflurry/version.py index 10aa336ce071b5ebf71e8545a55b72f3c5b661a3..b3f9ac7f1a3db1c3b67eb7be431b87759bd13ce4 100644 --- a/mhcflurry/version.py +++ b/mhcflurry/version.py @@ -1 +1 @@ -__version__ = "1.2.3" +__version__ = "1.2.4"