aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-08 07:53:25 -0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-08 07:53:25 -0800
commitac904e3cd3982c60d3e3183360c554d4e143ea96 (patch)
tree7b3722847f77ce92a57fbd630b0127e49e32196f
parenta617ee9d10f875b88db0c76eb18734537bc83904 (diff)
downloadcryptography-ac904e3cd3982c60d3e3183360c554d4e143ea96.tar.gz
cryptography-ac904e3cd3982c60d3e3183360c554d4e143ea96.tar.bz2
cryptography-ac904e3cd3982c60d3e3183360c554d4e143ea96.zip
bump values for development of the thirteenth release
-rw-r--r--CHANGELOG.rst5
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b8d460b3..7ae3f6b9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+1.3 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
1.2 - 2016-01-08
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 62cd62da..cffa6a69 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.2"
+__version__ = "1.3.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 ba8acf68..0d03d08c 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.2"
+__version__ = "1.3.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"