diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-02-27 20:21:09 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-02-28 09:21:09 +0800 |
| commit | 2130f898633861c621955eca8473a4d74076cae2 (patch) | |
| tree | 969923802155e3f22c07bd887a889f588f0504b7 | |
| parent | e4570532541be7284f7d6660a429eb12edf8b027 (diff) | |
| download | cryptography-2130f898633861c621955eca8473a4d74076cae2.tar.gz cryptography-2130f898633861c621955eca8473a4d74076cae2.tar.bz2 cryptography-2130f898633861c621955eca8473a4d74076cae2.zip | |
Reopen master for 2.7 (#4788)
| -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 511f1b22..668c46eb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +2.7 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + .. _v2-6-1: 2.6.1 - 2019-02-27 diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 62006c23..97132bdf 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.6.1" +__version__ = "2.7.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 94487ef8..08837c28 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.6.1" +__version__ = "2.7.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |