diff options
| author | Matt Clay <matt@mystile.com> | 2017-09-10 23:52:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 23:52:13 -0700 |
| commit | 50ae33d3c117bd18e9b63565d10017ce9041c7c1 (patch) | |
| tree | 34d10b1ae95310562284d1fae57b3aacb107add3 | |
| parent | 61d2620098643c3f624107808259853c0bcfe00c (diff) | |
| download | ansible-50ae33d3c117bd18e9b63565d10017ce9041c7c1.tar.gz | |
Fix wheel dependency on python 2.6. (#29388)
* Fix wheel dependency on python 2.6.
* Limit wheel version for tox on python 2.6.
| -rw-r--r-- | test/runner/requirements/constraints.txt | 1 | ||||
| -rw-r--r-- | test/runner/tox.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/runner/requirements/constraints.txt b/test/runner/requirements/constraints.txt index f7f9cd8cc1..b229cc763a 100644 --- a/test/runner/requirements/constraints.txt +++ b/test/runner/requirements/constraints.txt @@ -2,6 +2,7 @@ coverage >= 4.2, != 4.3.2 # features in 4.2+ required, avoid known bug in 4.3.2 pywinrm >= 0.2.1 # 0.1.1 required, but 0.2.1 provides better performance pylint >= 1.5.3, < 1.7.0 # 1.4.1 adds JSON output, but 1.5.3 fixes bugs related to JSON output sphinx < 1.6 ; python_version < '2.7' # sphinx 1.6 and later require python 2.7 or later +wheel < 0.30.0 ; python_version < '2.7' # wheel 0.30.0 and later require python 2.7 or later yamllint != 1.8.0 ; python_version < '2.7' # yamllint 1.8.0 requires python 2.7+ while earlier/later versions do not isort < 4.2.8 # 4.2.8 changes import sort order requirements which breaks previously passing pylint tests pycrypto >= 2.6 # Need features found in 2.6 and greater diff --git a/test/runner/tox.ini b/test/runner/tox.ini index 355121c69a..e3b6c47915 100644 --- a/test/runner/tox.ini +++ b/test/runner/tox.ini @@ -8,3 +8,4 @@ commands = {posargs} passenv = HOME SHIPPABLE* args_are_paths = False deps = setuptools == 35.0.2 + wheel < 0.30.0 ; python_version < '2.7' |