diff --git a/changelog/2926.bugfix b/changelog/2926.bugfix new file mode 100644 index 00000000000..09644b276d3 --- /dev/null +++ b/changelog/2926.bugfix @@ -0,0 +1 @@ +Remove ``py<1.5`` restriction from ``pytest`` as this can cause version conflicts in some installations. diff --git a/setup.py b/setup.py index c279ddf2d27..55607912bf4 100644 --- a/setup.py +++ b/setup.py @@ -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']