Fixed testing with Travis CI and Tox

sybrenstuvel · sybrenstuvel · commit ad510185b544 · 2018-09-16T11:27:27.000+02:00
- Added missing test dependencies.
- Updated `.travis.yml` and `tox.ini` to install deps and run with pipenv.
- Added testing on Python 3.7.
diff --git a/.gitignore b/.gitignore
@@ -8,10 +8,11 @@
 /distribute*.tar.gz
 /distribute*.egg
 
-/.tox/
-/.coverage
-/.coverage.*
-/.cache/
+.tox/
+.coverage
+.coverage.*
+.cache/
+.pytest_cache/
 __pycache__/
 
 /build/
diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,15 @@ python:
   - 3.4
   - 3.5
   - 3.6
+  - 3.7
   - "pypy"
 
 install:
-  - pip install tox-travis
-  - pip install -r requirements.txt
-  - pip install coveralls
+  - pip install pipenv
+  - pipenv install --dev --ignore-pipfile
 
 script:
-  - tox
+  - pipenv run py.test tox
 
 after_success:
-  - coveralls
+  - pipenv run coveralls
diff --git a/Pipfile b/Pipfile
@@ -10,6 +10,9 @@ name = "pypi"
 tox = "*"
 mock = ">=2.0.0"
 Sphinx = "*"
+coveralls = "*"
+pytest = "*"
+pytest-cov = "*"
 
 [requires]
 python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/tox.ini b/tox.ini
@@ -1,21 +1,20 @@
 [tox]
 # Environment changes have to be manually synced with '.travis.yml'.
-envlist = py27,py34,py35,py36,pypy
+envlist = py27,py34,py35,py36,p37,pypy
 
 [pytest]
 addopts = -v --cov rsa --cov-report term-missing
 
 [testenv]
-commands=py.test []
-deps=pyasn1 >=0.1.3
-     coverage >=3.5
-     PyTest
-     pytest-xdist
-     pytest-cov
-     mock
+deps = pipenv
+commands=
+    pipenv install --dev --ignore-pipfile
+    pipenv run py.test tests
 
 [testenv:py36]
-commands=py.test --doctest-modules rsa tests
+commands=
+    pipenv install --dev --ignore-pipfile
+    pipenv run py.test --doctest-modules rsa tests
 
 [pep8]
 max-line-length = 100
