diff options
| author | Ofekmeister <ofekmeister@gmail.com> | 2016-08-20 13:29:16 -0400 |
|---|---|---|
| committer | Ofekmeister <ofekmeister@gmail.com> | 2016-08-20 13:29:16 -0400 |
| commit | 9e11ba01ef15138fc928f720967bb4899d8bde38 (patch) | |
| tree | efad3b70a7e4a8bd0d491eb1f94c588db9c5ee16 /setup.py | |
| parent | 853a9df48cc056a07e17511a2b65918af9605bbc (diff) | |
| parent | 06df852e7cda567b6f8ab6831486285f0e2989a4 (diff) | |
| download | python-setuptools-git-9e11ba01ef15138fc928f720967bb4899d8bde38.tar.gz | |
Merge remote-tracking branch 'refs/remotes/pypa/master'
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -88,7 +88,7 @@ def pypi_link(pkg_filename): setup_params = dict( name="setuptools", - version="25.2.0", + version="25.4.0", description="Easily download, build, install, upgrade, and uninstall " "Python packages", author="Python Packaging Authority", @@ -181,7 +181,7 @@ setup_params = dict( tests_require=[ 'setuptools[ssl]', 'pytest-flake8', - 'pytest>=2.8', + 'pytest>=2.8,<3.0dev', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ ] + pytest_runner + wheel, |