aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-10-11 21:46:47 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2017-10-11 09:46:47 -0400
commit0d6831d24f59d1125906a83ec90a9e566d5624f4 (patch)
tree084d1d6aee2b58427c34f40431cd15cefc9ee69f
parent0ed0e7e87b5e83270f4aca4efc630790c1fea429 (diff)
downloadcryptography-0d6831d24f59d1125906a83ec90a9e566d5624f4.tar.gz
cryptography-0d6831d24f59d1125906a83ec90a9e566d5624f4.tar.bz2
cryptography-0d6831d24f59d1125906a83ec90a9e566d5624f4.zip
start the twenty second release cycle (#3960)
-rw-r--r--CHANGELOG.rst7
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 49acbc6a..a8a48a6e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
=========
+.. _v2-2:
+
+2.2 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
.. _v2-1:
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 3775996a..ee16ac8d 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.1"
+__version__ = "2.2.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 d1a01453..466a0167 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.1"
+__version__ = "2.2.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"