aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-11-22 10:50:28 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2016-11-21 21:50:28 -0500
commit4a2f36bc11342ca15cb49bfc313c20bbd4a045ae (patch)
treea5f7303b7cd5f8667afb29a2a0a74c51afcdf339
parent191e6e90bf6e37404bb65a4bf9b8a3211d77395d (diff)
downloadcryptography-4a2f36bc11342ca15cb49bfc313c20bbd4a045ae.tar.gz
cryptography-4a2f36bc11342ca15cb49bfc313c20bbd4a045ae.tar.bz2
cryptography-4a2f36bc11342ca15cb49bfc313c20bbd4a045ae.zip
bump version and set changelog date for 1.6 release (#3271)
-rw-r--r--CHANGELOG.rst6
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c99fcbd1..649a8065 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,8 @@
Changelog
=========
-1.6 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+1.6 - 2016-11-22
+~~~~~~~~~~~~~~~~
* Deprecated support for OpenSSL 1.0.0. Support will be removed in
``cryptography`` 1.7.
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index a056d791..923f2d9d 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.6.dev1"
+__version__ = "1.6"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 2280ce5c..41f7c99f 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.6.dev1"
+__version__ = "1.6"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"