Fixes for Travis CI

sybrenstuvel · sybrenstuvel · commit fd4cc60b7ac4 · 2018-09-16T13:30:34.000+02:00
- Remove `--ignore-pipfile`. This option makes Pipenv install from the `Pipfile.lock` only, ignoring the `Pipfile` itself. In a sense this is good, because it tests with the locked dependencies. However, it breaks when you lock on Python 3.6 but test on Python 3.4 or 2.7. We'll have to re-visit this when dropping support for older Pythons. - pypy 3.6 -> 3.5 - Drop `pypy` from Travis CI testing We still test with 'pypy3.5'. However, Pipenv has an issue with pypy 2.7. See pypa/pipenv#2449 - Pypy3.5 seems to want pathlib2 when running on Travis CI
diff --git 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
@@ -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
@@ -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]
