Skip to content

Commit

Permalink
Explicitly add setuptools to install_requires
Browse files Browse the repository at this point in the history
Setuptools is used in `_pytest/config.py` but was not explicitly listed as requirement. This led to an error when creating a Conda package for pytest since setuptools is not necessarily installed by default in Conda envs.
  • Loading branch information
sscherfke committed Dec 19, 2016
1 parent da40bcf commit 3f5edc7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -48,7 +48,7 @@ def has_environment_marker_support():


def main():
install_requires = ['py>=1.4.29'] # pluggy is vendored in _pytest.vendored_packages
install_requires = ['py>=1.4.29', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages
extras_require = {}
if has_environment_marker_support():
extras_require[':python_version=="2.6"'] = ['argparse']
Expand Down

0 comments on commit 3f5edc7

Please sign in to comment.