diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2018-05-01 08:53:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 08:53:18 -0400 |
| commit | 4ec8524932d715b5bc71a03ce81b96df195f6722 (patch) | |
| tree | 9781ebbd8799de35a21c5f62e4f83b577228f5db | |
| parent | b5d72640a7a5be77e14548f41b69357e44187579 (diff) | |
| parent | 14f75bcb5f3fe9734a6eb0d151ee748b12390fa7 (diff) | |
| download | python-setuptools-git-4ec8524932d715b5bc71a03ce81b96df195f6722.tar.gz | |
Merge pull request #1346 from ianw/pin-pytest-flake8
Pin pytest-flake8 to 1.0.0
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | tests/requirements.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ced8fa6b..9f09c0fa 100644 --- 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"' diff --git a/tests/requirements.txt b/tests/requirements.txt index fd826d09..aff32c10 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,6 +1,7 @@ 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 |