aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-07-17 16:38:15 +0200
committerAlex Gaynor <alex.gaynor@gmail.com>2017-07-17 10:38:15 -0400
commit9799e580c6b073a0a612bdc4f120365940d0da3d (patch)
tree3357d3517f0fe86b3d6d25bd359329ca19c5c6a1
parentab4a0b39d0ccfedb07d64a70db77e62133915165 (diff)
downloadcryptography-9799e580c6b073a0a612bdc4f120365940d0da3d.tar.gz
cryptography-9799e580c6b073a0a612bdc4f120365940d0da3d.tar.bz2
cryptography-9799e580c6b073a0a612bdc4f120365940d0da3d.zip
2.0 version bump and changelog (#3787)
* 2.0 version bump and changelog * dates are just an illusion
-rw-r--r--CHANGELOG.rst6
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index aa0e2e90..563c32e9 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-17
+~~~~~~~~~~~~~~~~
* **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 1573f697..4b4b6dd0 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.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 8a6b3ae7..9ee01dd0 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.dev1"
+__version__ = "2.0"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"