diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-08-26 20:55:44 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-08-27 08:55:44 +0800 |
| commit | f25e63d272e9e785717ecec9af8ef0b0d1140130 (patch) | |
| tree | 91ca1168d99b2d77330c2559f8e75e3044901f19 | |
| parent | c0ee738a8460dc3551758400772978ed62a84d46 (diff) | |
| download | cryptography-f25e63d272e9e785717ecec9af8ef0b0d1140130.tar.gz cryptography-f25e63d272e9e785717ecec9af8ef0b0d1140130.tar.bz2 cryptography-f25e63d272e9e785717ecec9af8ef0b0d1140130.zip | |
Reopen master for 1.6 (#3112)
| -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 6aeba4fb..667720c2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +1.6 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 1.5 - 2016-08-26 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 3c389867..a056d791 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" +__version__ = "1.6.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 495b851a..2280ce5c 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" +__version__ = "1.6.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |