diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-08 11:54:43 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-08 11:54:43 -0500 |
| commit | a130c402309603a65258ba455c7976a776f2a454 (patch) | |
| tree | 7b3722847f77ce92a57fbd630b0127e49e32196f | |
| parent | a617ee9d10f875b88db0c76eb18734537bc83904 (diff) | |
| parent | ac904e3cd3982c60d3e3183360c554d4e143ea96 (diff) | |
| download | cryptography-a130c402309603a65258ba455c7976a776f2a454.tar.gz cryptography-a130c402309603a65258ba455c7976a776f2a454.tar.bz2 cryptography-a130c402309603a65258ba455c7976a776f2a454.zip | |
Merge pull request #2651 from reaperhulk/start-thirteenth-release
open master for development of the thirteenth release
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b8d460b3..7ae3f6b9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +1.3 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 1.2 - 2016-01-08 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 62cd62da..cffa6a69 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" +__version__ = "1.3.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 ba8acf68..0d03d08c 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" +__version__ = "1.3.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |