From 3e7615d00243ea38427133ab125c9f2e5ac0482f Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Fri, 4 Oct 2019 19:49:14 +0200 Subject: [PATCH 1/2] Remove explicit clonce as the viper-test-files are now a Git submodule --- travis/install_travis.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/travis/install_travis.sh b/travis/install_travis.sh index 0db7e4c..9070cbd 100644 --- a/travis/install_travis.sh +++ b/travis/install_travis.sh @@ -11,6 +11,3 @@ else pip install pipenv pipenv update --dev fi -pushd tests -git clone https://github.com/viper-framework/viper-test-files.git -popd From 76f0ab113df48029c4d1672788f61d36be099668 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Fri, 4 Oct 2019 19:49:27 +0200 Subject: [PATCH 2/2] Fix mixed whitespace in the travis helper script files --- travis/install_travis.sh | 4 ++-- travis/test_travis.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/travis/install_travis.sh b/travis/install_travis.sh index 9070cbd..268b128 100644 --- a/travis/install_travis.sh +++ b/travis/install_travis.sh @@ -8,6 +8,6 @@ if [ ${LEGACY} == true ]; then pip install .[fileobjects] else # We're in python3, installing with pipenv. - pip install pipenv - pipenv update --dev + pip install pipenv + pipenv update --dev fi diff --git a/travis/test_travis.sh b/travis/test_travis.sh index 49c4b6f..d773f95 100644 --- a/travis/test_travis.sh +++ b/travis/test_travis.sh @@ -7,5 +7,5 @@ if [ -z ${LEGACY} ]; then # We're in python3, test all and use pipenv. pipenv run nosetests-3.4 --with-coverage --cover-package=pymisp,tests --cover-tests tests/test_*.py else - nosetests --with-coverage --cover-package=pymisp,tests --cover-tests tests/test_mispevent.py + nosetests --with-coverage --cover-package=pymisp,tests --cover-tests tests/test_mispevent.py fi