Fix wheel dependency on python 2.6. (#29388)

* Fix wheel dependency on python 2.6.
* Limit wheel version for tox on python 2.6.
This commit is contained in:
Matt Clay 2017-09-10 23:52:13 -07:00 committed by GitHub
parent 61d2620098
commit 50ae33d3c1
2 changed files with 2 additions and 0 deletions

View file

@ -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 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 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 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 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 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 pycrypto >= 2.6 # Need features found in 2.6 and greater

View file

@ -8,3 +8,4 @@ commands = {posargs}
passenv = HOME SHIPPABLE* passenv = HOME SHIPPABLE*
args_are_paths = False args_are_paths = False
deps = setuptools == 35.0.2 deps = setuptools == 35.0.2
wheel < 0.30.0 ; python_version < '2.7'