From 2130f898633861c621955eca8473a4d74076cae2 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 27 Feb 2019 20:21:09 -0500 Subject: Reopen master for 2.7 (#4788) --- CHANGELOG.rst | 5 +++++ src/cryptography/__about__.py | 2 +- 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" -- cgit v1.2.3