diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2020-04-02 17:16:18 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-02 18:16:18 -0400 |
commit | e687b8f7f40e30ef88e9de889c55cd7fdec99762 (patch) | |
tree | 4b435ccb259e851d4cbbb0891d744a7f70ed44de | |
parent | 81b7fc65460247c4212efd9484779d8b3e516c26 (diff) | |
download | cryptography-e687b8f7f40e30ef88e9de889c55cd7fdec99762.tar.gz cryptography-e687b8f7f40e30ef88e9de889c55cd7fdec99762.tar.bz2 cryptography-e687b8f7f40e30ef88e9de889c55cd7fdec99762.zip |
reopen master for 3.0 dev (#5175)
-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 9f3cea0f..0f31c61c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v3-0: + +3.0 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + .. _v2-9: 2.9 - 2020-04-02 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index a3a1a502..92d5042e 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.9" +__version__ = "3.0.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 430af2b5..420632e6 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.9" +__version__ = "3.0.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |