diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-17 14:59:03 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-17 20:59:03 +0200 |
| commit | 9c521ee290243eeeb1735ee98de6104bdc22456a (patch) | |
| tree | 77a36468f915a9e33bc97c5c27b13a1dd09a0047 | |
| parent | 9799e580c6b073a0a612bdc4f120365940d0da3d (diff) | |
| download | cryptography-9c521ee290243eeeb1735ee98de6104bdc22456a.tar.gz cryptography-9c521ee290243eeeb1735ee98de6104bdc22456a.tar.bz2 cryptography-9c521ee290243eeeb1735ee98de6104bdc22456a.zip | |
Open master for 2.1 (#3788)
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 563c32e9..9ce4b96a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +2.1 - - `master`_ +~~~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 2.0 - 2017-07-17 ~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 4b4b6dd0..e99a87d1 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.0" +__version__ = "2.1.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 9ee01dd0..951ef354 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.0" +__version__ = "2.1.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |