Merge pull request #1346 from ianw/pin-pytest-flake8

Pin pytest-flake8 to 1.0.0

Merge pull request #1346 from ianw/pin-pytest-flake8
Pin pytest-flake8 to 1.0.0
4ec85249 · Jason R. Coombs · GitHub · b5d72640 · 14f75bcb · 4ec85249
Commit 4ec85249 authored May 01, 2018 by Jason R. Coombs Committed by GitHub May 01, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

.travis.yml .travis.yml +2 -0

tests/requirements.txt tests/requirements.txt +2 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,8 @@ jobs:
 cache: pip

 install:
+# ensure we have recent pip/setuptools
+- pip install --upgrade pip setuptools
 # need tox to get started
 - pip install tox 'tox-venv; python_version!="3.3"'


--- a/tests/requirements.txt
+++ b/tests/requirements.txt
 importlib; python_version<"2.7"
 mock
-pytest-flake8; python_version>="2.7"
+pytest-flake8<=1.0.0; python_version>="3.3" and python_version<"3.5"
+pytest-flake8; python_version>="2.7" and python_version!="3.3" and python_version!="3.4"
 virtualenv>=13.0.0
 pytest-virtualenv>=1.2.7
 pytest>=3.0.2