diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-18 09:08:02 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-18 09:08:02 -0400 |
commit | bf1566ec4be14110cbca5a36ee339a76ac9f6272 (patch) | |
tree | ba12cc6c64a15464b95ef5812abf3ae13f9828e8 | |
parent | 3e243ab79781de1818826065f28da3c3b7bb347c (diff) | |
parent | c969461f0f49e07708aa8217af3c75f781ea4cde (diff) | |
download | cryptography-bf1566ec4be14110cbca5a36ee339a76ac9f6272.tar.gz cryptography-bf1566ec4be14110cbca5a36ee339a76ac9f6272.tar.bz2 cryptography-bf1566ec4be14110cbca5a36ee339a76ac9f6272.zip |
Merge pull request #2835 from reaperhulk/1.3-changelog
bump version and update changelog
-rw-r--r-- | CHANGELOG.rst | 6 | ||||
-rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
-rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 63dab998..d7aefd69 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,8 @@ Changelog ========= -1.3 - `master`_ -~~~~~~~~~~~~~~~ - -.. note:: This version is not yet released and is under active development. +1.3 - 2016-03-18 +~~~~~~~~~~~~~~~~ * Added support for padding ANSI X.923 with :class:`~cryptography.hazmat.primitives.padding.ANSIX923`. diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index cffa6a69..c17f576a 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.3.dev1" +__version__ = "1.3" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 0d03d08c..0e0296a6 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.3.dev1" +__version__ = "1.3" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |