summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml17
-rw-r--r--Pipfile1
-rw-r--r--tox.ini2
3 files changed, 13 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 0df42d2..9b4da02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,20 @@ cache: pip
# See: https://github.com/travis-ci/travis-ci/issues/9815
python:
- - 2.7
- - 3.4
- - 3.5
- - 3.6
- - "pypy"
+ - "2.7"
+ - "3.4"
+ - "3.5"
+ - "3.6"
+ - "3.7-dev"
+
+# This is blocked by https://github.com/pypa/pipenv/issues/2449,
+# also see https://github.com/pypa/pipenv/projects/7
+# - "pypy"
+ - "pypy3.5"
install:
- pip install pipenv
- - pipenv install --dev --ignore-pipfile
+ - pipenv install --dev
script:
- pipenv run py.test
diff --git a/Pipfile b/Pipfile
index 00e58f5..89ec5fd 100644
--- a/Pipfile
+++ b/Pipfile
@@ -13,6 +13,7 @@ Sphinx = "*"
coveralls = "*"
pytest = "*"
pytest-cov = "*"
+pathlib2 = {version = "*", markers="python_version < '3.6'"}
[requires]
python_version = "3.6"
diff --git a/tox.ini b/tox.ini
index aa4a28e..a3109e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ addopts = -v --cov rsa --cov-report term-missing
[testenv]
deps = pipenv
commands=
- pipenv install --dev --ignore-pipfile
+ pipenv install --dev
pipenv run py.test tests
[testenv:py36]