From c0ee738a8460dc3551758400772978ed62a84d46 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 26 Aug 2016 22:59:49 +0800 Subject: update changelog and bump version for 1.5 release (#3111) --- 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 f8740739..6aeba4fb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,8 @@ Changelog ========= -1.5 - `master`_ -~~~~~~~~~~~~~~~ - -.. note:: This version is not yet released and is under active development. +1.5 - 2016-08-26 +~~~~~~~~~~~~~~~~ * Added :func:`~cryptography.hazmat.primitives.asymmetric.padding.calculate_max_pss_salt_length`. diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 15ed36dd..3c389867 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.5.dev1" +__version__ = "1.5" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index f756b9da..495b851a 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.5.dev1" +__version__ = "1.5" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" -- cgit v1.2.3