Release 1.25 (#1568)

urllib3 · Apr 22, 2019 · c3157af · c3157af
1 parent bbeeae2
commit c3157af
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,34 +1,32 @@
 Changes
 =======
 
-dev (master)
-------------
+1.25 (2019-04-22)
+-----------------
 
-* Implemented a more efficient ``HTTPResponse.__iter__()`` method. (Issue #1483)
+* Require and validate certificates by default when using HTTPS (Pull #1507)
 
 * Upgraded ``urllib3.utils.parse_url()`` to be RFC 3986 compliant. (Pull #1487)
 
 * Added support for ``key_password`` for ``HTTPSConnectionPool`` to use
   encrypted ``key_file`` without creating your own ``SSLContext`` object. (Pull #1489)
 
+* Add TLSv1.3 support to CPython, pyOpenSSL, and SecureTransport ``SSLContext``
+  implementations. (Pull #1496)
+
+* Switched the default multipart header encoder from RFC 2231 to HTML 5 working draft. (Issue #303, PR #1492)
+
 * Fixed issue where OpenSSL would block if an encrypted client private key was
   given and no password was given. Instead an ``SSLError`` is raised. (Pull #1489)
 
-* Require and validate certificates by default when using HTTPS (Pull #1507)
-
 * Added support for Brotli content encoding. It is enabled automatically if
   ``brotlipy`` package is installed which can be requested with
   ``urllib3[brotli]`` extra. (Pull #1532)
 
-* Add TLSv1.3 support to CPython, pyOpenSSL, and SecureTransport ``SSLContext``
-  implementations. (Pull #1496)
-
 * Drop ciphers using DSS key exchange from default TLS cipher suites.
   Improve default ciphers when using SecureTransport. (Pull #1496)
 
-* Switched the default multipart header encoder from RFC 2231 to HTML 5 working draft. (Issue #303, PR #1492)
-
-* ... [Short description of non-trivial change.] (Issue #)
+* Implemented a more efficient ``HTTPResponse.__iter__()`` method. (Issue #1483)
 
 
 1.24.2 (2019-04-17)

diff --git a/_travis/downstream/requests-requirements.txt b/_travis/downstream/requests-requirements.txt
@@ -0,0 +1,9 @@
+pytest-mock
+pysocks
+httpbin
+
+# kennethreitz/requests#5049
+pytest<4.1
+
+# kennethreitz/requests#5004
+pytest-httpbin==0.3.0
diff --git a/_travis/downstream/requests.sh b/_travis/downstream/requests.sh
@@ -7,15 +7,12 @@ case "${1}" in
         git clone --depth 1 https://github.com/kennethreitz/requests
         cd requests
         git rev-parse HEAD
-        python -m pip install --upgrade pipenv
-        pipenv install --dev --skip-lock
-
-        # See: kennethreitz/requests/5004
-        python -m pip install pytest-httpbin==0.3.0
+        python -m pip install -r ${TRAVIS_BUILD_DIR}/_travis/downstream/requests-requirements.txt
+        python -m pip install .
         ;;
     run)
         cd requests
-        pipenv run py.test -n 8 --boxed
+        pytest tests/
         ;;
     *)
         exit 1

diff --git a/src/urllib3/__init__.py b/src/urllib3/__init__.py
@@ -26,7 +26,7 @@
 
 __author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
 __license__ = 'MIT'
-__version__ = 'dev'
+__version__ = '1.25'
 
 __all__ = (
     'HTTPConnectionPool',