From b6940968ced4314f728202d65d9965670dce8637 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 31 May 2019 00:27:01 -0400 Subject: reopen master for 2.8 (#4906) * reopen master for 2.8 also add the missing changelog * sigh, empty commit to trigger azure pipelines --- CHANGELOG.rst | 9 +++++++++ src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4d2b7ccc..5722e7b6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Changelog ========= +.. _v2-8: + +2.8 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + .. _v2-7: 2.7 - 2019-05-30 @@ -12,6 +19,8 @@ Changelog ``cryptography.hazmat.primitives.mac.MACContext`` interface. The ``CMAC`` and ``HMAC`` APIs have not changed, but they are no longer registered as ``MACContext`` instances. +* Updated Windows, macOS, and ``manylinux1`` wheels to be compiled with + OpenSSL 1.1.1c. * Removed support for running our tests with ``setup.py test``. Users interested in running our tests can continue to follow the directions in our :doc:`development documentation`. diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 3bd1fb87..703a4a5e 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.7" +__version__ = "2.8.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 0cbb8003..c550032d 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.7" +__version__ = "2.8.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" -- cgit v1.2.3