Merge branch 'fix-travis'

.appveyor.yml

@@ -21,7 +21,7 @@ build: off
 install:
   - "%PYTHON%\\python.exe -m pip install --upgrade pip"
   - "%PYTHON%\\python.exe -m pip install --upgrade wheel>=0.30.0 setuptools>=36.6.0"
-  - "%PYTHON%\\python.exe -m pip install --upgrade tox==3.14.0 codecov==2.0.15 tox-venv==0.4.0"
+  - "%PYTHON%\\python.exe -m pip install -r appveyor-requirements.txt"
 
 test_script:
   - "%PYTHON%\\python.exe -m tox -vv -- --cov-report=xml"

.travis.yml

@@ -94,7 +94,7 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then git -C "$(pyenv root)" fetch && git -C "$(pyenv root)" checkout master && git -C "$(pyenv root)" pull; fi
 
 install:
-  - python -m pip install tox==3.14.0 codecov==2.0.15 tox-pyenv==1.1.0 virtualenv==15.2.0
+  - python -m pip install -r travis-requirements.txt
   - pyenv install $(pyenv exec python --version >/dev/null 2>&1 && echo "--skip-existing" || echo "--force")  "${PYENV_VERSION}"
 
 script:

appveyor-requirements.txt

@@ -0,0 +1,3 @@
+tox==3.14.3
+codecov==2.0.15
+tox-venv==0.4.0

setup.cfg

@@ -39,16 +39,21 @@ long_description = file: README.rst
 zip_safe = 1
 python_requires = >=2.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,
 tests_require =
-    pycodestyle<2.5.0; python_version < "2.7"
-    pycodestyle>=2.5.0; python_version >= "2.7"
-    pytest<=3.2.5; python_version < "2.7"
-    pytest<5.0.0; python_version >= "2.7" and python_version < "3.5"
-    pytest>=5.0.0; python_version >= "3.5"
-    pytest-cov<2.6.0; python_version < "2.7"
-    pytest-cov>=2.6.0; python_version >= "2.7"
-    pytest-mock<1.7.0; python_version < "2.7"
-    pytest-mock>=1.7.0; python_version >= "2.7"
-    setuptools<=36.8.0; python_version < "2.7"
+    colorama==0.4.1; python_version >= "2.7" and python_version < "3.5"
+    coverage==4.5.4; python_version < "3.5"
+    importlib-metadata==0.23; python_version >= "2.7" and python_version < "3.5"
+    more-itertools==7.2.0; python_version >= "3.4" and python_version < "3.5"
+    pycodestyle==2.4.0; python_version < "2.7"
+    pycodestyle==2.5.0; python_version >= "2.7"
+    pytest==3.2.5; python_version < "2.7"
+    pytest==4.6.6; python_version >= "2.7" and python_version < "3.5"
+    pytest==5.2.2; python_version >= "3.5"
+    pytest-cov==2.5.1; python_version < "2.7"
+    pytest-cov==2.8.1; python_version >= "2.7"
+    pytest-mock==1.6.3; python_version < "2.7"
+    pytest-mock==1.11.2; python_version >= "2.7"
+    setuptools==36.8.0; python_version < "2.7"
+    zipp==1.1.0; python_version >= "2.7" and python_version < "3.6"
 
 [tool:pytest]
 addopts= --cov=git_archive_all --cov-report=term --cov-branch --showlocals -vv
@@ -68,7 +73,7 @@ envlist =
 skipsdist = true
 
 [testenv]
-deps = -rrequirements.txt
+deps = -rtest-requirements.txt
 commands = pytest {posargs}
 tox_pyenv_fallback = false
 

travis-requirements.txt

@@ -0,0 +1,4 @@
+tox==3.14.3
+codecov==2.0.15
+tox-pyenv==1.1.0
+virtualenv==15.2.0