jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove py<1.5 restriction 

Fix #2926
This commit is contained in:
Bruno Oliveira 2017-11-14 22:08:03 -02:00
parent 4a0aea2deb
commit dd6c534468
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/2926.bugfix Normal file
View File

@ -0,0 +1 @@
Remove ``py<1.5`` restriction from ``pytest`` as this can cause version conflicts in some installations.

2
setup.py
View File

@ -43,7 +43,7 @@ def has_environment_marker_support():
def main(): def main():
install_requires = ['py>=1.4.33,<1.5', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages install_requires = ['py>=1.4.33', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages
extras_require = {} extras_require = {}
if has_environment_marker_support(): if has_environment_marker_support():
extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict'] extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']