diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-04 12:00:54 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-04 12:00:54 -0700 |
| commit | 67ea444a05818703f7a595c5014d9fbc43d80c9c (patch) | |
| tree | 0a6fab60b4a5c7cd3b6dd13dd82e6904d2f8c94f | |
| parent | 69365ce2041081fe6b109496bbb9c56f86ccb7b5 (diff) | |
| download | cryptography-67ea444a05818703f7a595c5014d9fbc43d80c9c.tar.gz cryptography-67ea444a05818703f7a595c5014d9fbc43d80c9c.tar.bz2 cryptography-67ea444a05818703f7a595c5014d9fbc43d80c9c.zip | |
reopen master for work on fifteenth release (#2964)
| -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, 8 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1aa2131b..65dfebe1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ Changelog ========= +1.5 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + + 1.4 - 2016-06-04 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index dc7c412f..15ed36dd 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.4" +__version__ = "1.5.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 5d90e887..f756b9da 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.4" +__version__ = "1.5.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |