From 874b1e201e380d886e51a4089787858d0f3e44cf Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 17 Jul 2017 15:56:28 +0200 Subject: [PATCH 1/2] 2.0 version bump and changelog --- CHANGELOG.rst | 6 ++---- src/cryptography/__about__.py | 2 +- vectors/cryptography_vectors/__about__.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index aa0e2e906ae0..89ca22d0b882 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,8 @@ Changelog ========= -2.0 - `master`_ -~~~~~~~~~~~~~~~ - -.. note:: This version is not yet released and is under active development. +2.0 - 2017-07-07 +~~~~~~~~~~~~~~~~ * **BACKWARDS INCOMPATIBLE:** Support for Python 3.3 has been dropped. * We now ship ``manylinux1`` wheels linked against OpenSSL 1.1.0f. These wheels diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 1573f6978bb2..4b4b6dd04a5e 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -14,7 +14,7 @@ " and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.0.dev1" +__version__ = "2.0" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 8a6b3ae7098e..9ee01dd02a7f 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -14,7 +14,7 @@ __uri__ = "https://github.com/pyca/cryptography" -__version__ = "2.0.dev1" +__version__ = "2.0" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" From dbd16afe4546608ae15ea80ee8ae12b6500eb5a2 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 17 Jul 2017 16:11:13 +0200 Subject: [PATCH 2/2] dates are just an illusion --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 89ca22d0b882..563c32e9ead7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -2.0 - 2017-07-07 +2.0 - 2017-07-17 ~~~~~~~~~~~~~~~~ * **BACKWARDS INCOMPATIBLE:** Support for Python 3.3 has been dropped.