diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-03-18 23:30:18 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-03-18 23:30:18 -0400 |
| commit | b6400af03f50a57f1d2393a4f56ab285fa687e93 (patch) | |
| tree | 906add72c2d9c70126b80166114fcf47b158a078 | |
| parent | 4601fbab9552b0fc938ae3864e9c14e4476231c0 (diff) | |
| download | cryptography-b6400af03f50a57f1d2393a4f56ab285fa687e93.tar.gz cryptography-b6400af03f50a57f1d2393a4f56ab285fa687e93.tar.bz2 cryptography-b6400af03f50a57f1d2393a4f56ab285fa687e93.zip | |
open master for 2.3 (#4151)
| -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 84f3dbc5..d36991ac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v2-3: + +2.3 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + .. _v2-2: 2.2 - 2018-03-19 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 53d31c22..b198409d 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.2" +__version__ = "2.3.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 70cca353..d15f1aba 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.2" +__version__ = "2.3.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |