aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-12-12 16:41:26 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2016-12-12 17:41:26 -0500
commitfad63fe138581247fed032679c65933f2128bb9e (patch)
tree905be93e2f1fab019bbae92080192fad222b634f
parent5df72e82c0156b0e60d355c5c03c85dcf2e694fb (diff)
downloadcryptography-fad63fe138581247fed032679c65933f2128bb9e.tar.gz
cryptography-fad63fe138581247fed032679c65933f2128bb9e.tar.bz2
cryptography-fad63fe138581247fed032679c65933f2128bb9e.zip
1.8 begins (#3311)
-rw-r--r--CHANGELOG.rst6
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d232cac6..41818014 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
Changelog
=========
+1.8 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+
1.7 - 2016-12-12
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 0426ffaa..55b326c7 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__ = "1.7"
+__version__ = "1.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 f026d527..168e752a 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__ = "1.7"
+__version__ = "1.8.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"