From 5afe66c08c2ba199d81d77cd7eccd299c1fdf816 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Sun, 8 Apr 2018 11:42:22 -0400 Subject: [PATCH] Test fixes? Signed-off-by: Dan Ryan --- .travis.yml | 3 ++- Pipfile.lock | 6 ++++++ setup.py | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7628a782..93c49cb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ env: # command to install dependencies install: + - 'export CACHE_NAME="$TRAVIS_PYTHON_VERSION-$CACHE_NAME"' - "git config --global core.sharedRepository true" - "pip install --upgrade pip" - "pip install -e . --upgrade --upgrade-strategy=only-if-needed" @@ -35,7 +36,7 @@ script: - "pip install --upgrade -e ." - "pipenv run pip install -e ." - "pipenv install --dev" - - 'echo "Running Tests: $TEST_SUITE"' + - 'echo Running Tests: "$TEST_SUITE"' - 'pipenv run pytest -n auto -v -m "$TEST_SUITE" --ignore="pipenv/vendor" --ignore="pipenv/patched"' jobs: diff --git a/Pipfile.lock b/Pipfile.lock index c14832ca..29bc7eb0 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -261,6 +261,12 @@ ], "version": "==4.1.0" }, + "ordereddict": { + "hashes": [ + "sha256:1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f" + ], + "version": "==1.1" + }, "pathlib2": { "hashes": [ "sha256:24e0b33e1333b55e73c9d1e9a8342417d519f7789a9d3b440f4acd00ea45157e", diff --git a/setup.py b/setup.py index 918c5bfd..f4ebf98b 100644 --- a/setup.py +++ b/setup.py @@ -22,9 +22,9 @@ required = [ 'setuptools>=36.2.1', 'virtualenv-clone>=0.2.5', 'virtualenv', - 'pathlib2==2.1.0; python_version<"3.4"', - 'requests[security]; python_version<"3.0"', - 'ordereddict; python_version<"3.0"', + 'pathlib2==2.1.0;python_version<"3.4"', + 'requests[security];python_version<"3.0"', + 'ordereddict;python_version<"3.0"', ]