aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-03-10 08:36:18 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2017-03-10 07:36:18 -0500
commitd0aad454865849d652d52e040f2828bf42e2edca (patch)
tree9b1d9657f4ab84f012ff46bd2cedf73319fa16da
parent928e4ee28564359973298624cf023ae5ea7f62c3 (diff)
downloadcryptography-d0aad454865849d652d52e040f2828bf42e2edca.tar.gz
cryptography-d0aad454865849d652d52e040f2828bf42e2edca.tar.bz2
cryptography-d0aad454865849d652d52e040f2828bf42e2edca.zip
port 1.8.1 changelog and update master for 1.9 release cycle (#3440)
-rw-r--r--CHANGELOG.rst11
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 363025b3..d0988b34 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,17 @@
Changelog
=========
+1.9 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+
+1.8.1 - 2017-03-10
+~~~~~~~~~~~~~~~~~~
+
+* Fixed macOS wheels to properly link against 1.1.0 rather than 1.0.2.
+
1.8 - 2017-03-09
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 7da4a523..85714a04 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "1.8"
+__version__ = "1.9.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 3993b003..6150e24f 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package."
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "1.8"
+__version__ = "1.9.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"