From 577f95e4c062fca3376ddc896ee1bb62f34b6fbe Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 7 Jan 2016 21:56:53 -0800 Subject: bump version and changelog for the twelfth release --- CHANGELOG.rst | 6 ++---- src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 717c9e71..b8d460b3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,8 @@ Changelog ========= -1.2 - `master`_ -~~~~~~~~~~~~~~~ - -.. note:: This version is not yet released and is under active development. +1.2 - 2016-01-08 +~~~~~~~~~~~~~~~~ * **BACKWARDS INCOMPATIBLE:** :class:`~cryptography.x509.RevokedCertificate` diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index f25cbc89..62cd62da 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.2.dev1" +__version__ = "1.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 11bd69fb..ba8acf68 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.2.dev1" +__version__ = "1.2" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" -- cgit v1.2.3