diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-02 09:22:13 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-02 09:22:13 -0500 |
| commit | 8d5dc98e2dead2519eba07b4de07d585df0cc30a (patch) | |
| tree | 6fcc45da77090036c6a5f04e9085e7e17a582367 | |
| parent | 67487d66104dc9382e6c11a5cb317c0a079672fd (diff) | |
| parent | cf469bf239cc6c0d4ebb766c5e2b6c6098e2b28b (diff) | |
| download | external_python_setuptools-8d5dc98e2dead2519eba07b4de07d585df0cc30a.tar.gz external_python_setuptools-8d5dc98e2dead2519eba07b4de07d585df0cc30a.tar.bz2 external_python_setuptools-8d5dc98e2dead2519eba07b4de07d585df0cc30a.zip | |
Merge with master
| -rw-r--r-- | CHANGES.rst | 11 | ||||
| -rwxr-xr-x | setup.py | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index c536a7be..6f9c53d2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,12 +2,17 @@ CHANGES ======= -v28.1.0 +v28.2.0 ------- * #805: Disable ``-nspkg.pth`` behavior on Python 3.3+ where PEP-420 functionality is adequate. Fixes pip #1924. +v28.1.0 +------- + +* #803: Bump certifi to 2016.9.26. + v28.0.0 ------- @@ -96,7 +101,7 @@ v26.1.1 ------- * Re-release of 26.1.0 with pytest pinned to allow for automated - deployement and thus proper packaging environment variables, + deployment and thus proper packaging environment variables, fixing issues with missing executable launchers. v26.1.0 @@ -126,7 +131,7 @@ v25.4.0 ------- * Add Extension(py_limited_api=True). When set to a truthy value, - that extension gets a filename apropriate for code using Py_LIMITED_API. + that extension gets a filename appropriate for code using Py_LIMITED_API. When used correctly this allows a single compiled extension to work on all future versions of CPython 3. The py_limited_api argument only controls the filename. To be @@ -167,11 +167,11 @@ setup_params = dict( """).strip().splitlines(), extras_require={ "ssl:sys_platform=='win32'": "wincertstore==0.2", - "certs": "certifi==2016.8.31", + "certs": "certifi==2016.9.26", }, dependency_links=[ pypi_link( - 'certifi-2016.8.31.tar.gz#md5=2f22d484a36d38d98be74f9eeb2846ec', + 'certifi-2016.9.26.tar.gz#md5=baa81e951a29958563689d868ef1064d', ), pypi_link( 'wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2', @@ -181,7 +181,8 @@ setup_params = dict( tests_require=[ 'setuptools[ssl]', 'pytest-flake8', - 'pytest>=3.0.2', + # pin pytest to 3.0.2 for pytest-dev/pytest#1888 + 'pytest==3.0.2', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ ] + pytest_runner + wheel, |