diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-07-19 06:35:38 +0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-07-18 17:35:37 -0500 |
commit | 39a3efbfafd0f9ebed9d9ea08a885e68c97e8045 (patch) | |
tree | 5345e14f552e5daa1dee2eefcd406dc248a256d1 | |
parent | 0a846e294806478770469219a26cd49dcb5502d7 (diff) | |
download | cryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.tar.gz cryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.tar.bz2 cryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.zip |
reopen master (#4359)
-rw-r--r-- | CHANGELOG.rst | 7 | ||||
-rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
-rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 12c4d652..41026519 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v2-4: + +2.4 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + .. _v2-3: 2.3 - 2018-07-18 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 935e6560..8811cc2a 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.3" +__version__ = "2.4.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 8f73dc73..4b46fbee 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.3" +__version__ = "2.4.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |