summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Reitz <me@kennethreitz.org>2017-06-16 18:31:19 -0400
committerKenneth Reitz <me@kennethreitz.org>2017-06-16 18:31:19 -0400
commitbbeb1c32d2ad4cdc1053e4b614bd7aa4eb9ebdde (patch)
treef5bc7f843adda81b9a09e1797007e993166f7fd6
parent1263b8660d1f28b4a564d9500e3d0fdb03b05bf4 (diff)
parent2fde9ee4076b8828f858e37cfdcee66008ff35f9 (diff)
downloadpython-requests-bbeb1c32d2ad4cdc1053e4b614bd7aa4eb9ebdde.tar.gz
Merge branch 'master' of github.com:kennethreitz/requests
-rw-r--r--HISTORY.rst17
-rw-r--r--requests/__version__.py4
2 files changed, 18 insertions, 3 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 45111752..fcf44951 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,7 +8,22 @@ dev
**Improvements**
-- ``Response`` is now a context manager, so can be used directly in a `with` statement
+**Bugfixes**
+
+2.18.1 (2017-06-14)
++++++++++++++++++++
+
+**Bugfixes**
+
+- Fix an error in the packaging whereby the *.whl contained incorrect data that
+ regressed the fix in v2.17.3.
+
+2.18.0 (2017-06-14)
++++++++++++++++++++
+
+**Improvements**
+
+- ``Response`` is now a context manager, so can be used directly in a ``with`` statement
without first having to be wrapped by ``contextlib.closing()``.
**Bugfixes**
diff --git a/requests/__version__.py b/requests/__version__.py
index b21ba352..8c7ebbbc 100644
--- a/requests/__version__.py
+++ b/requests/__version__.py
@@ -5,8 +5,8 @@
__title__ = 'requests'
__description__ = 'Python HTTP for Humans.'
__url__ = 'http://python-requests.org'
-__version__ = '2.17.3'
-__build__ = 0x021703
+__version__ = '2.18.1'
+__build__ = 0x021801
__author__ = 'Kenneth Reitz'
__author_email__ = 'me@kennethreitz.org'
__license__ = 'Apache 2.0'