Skip to content

Commit

Permalink
Remove py<1.5 restriction
Browse files Browse the repository at this point in the history
Fix #2926
  • Loading branch information
nicoddemus committed Nov 15, 2017
1 parent 4a0aea2 commit dd6c534
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog/2926.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove ``py<1.5`` restriction from ``pytest`` as this can cause version conflicts in some installations.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def has_environment_marker_support():


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 = {}
if has_environment_marker_support():
extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']
Expand Down

0 comments on commit dd6c534

Please sign in to comment.