diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-22 11:25:41 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-22 12:25:41 -0500 |
| commit | ccf8ef3eb73bac73629dc95334df0ececb6853d3 (patch) | |
| tree | 223f7677758220e35460ea474a96b6bd83f07b35 | |
| parent | 83aa36dd407d0eb9a10e20cc35c51274174cd5bc (diff) | |
| download | cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.gz cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.bz2 cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.zip | |
reopen master for 2.6 work (#4730)
| -rw-r--r-- | CHANGELOG.rst | 8 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7ee6d4d9..cbf032eb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,14 @@ Changelog ========= +.. _v2-6: + +2.6 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + + .. _v2-5: 2.5 - 2019-01-22 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 02f81f6e..87890823 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__ = "2.5" +__version__ = "2.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 6fcb314e..330fa0d2 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__ = "2.5" +__version__ = "2.6.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |