aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-05-03 15:13:41 +0100
committerAlex Stapleton <alexs@prol.etari.at>2014-05-03 15:13:41 +0100
commit0520c2973509f6a45d2ad06dc2d84a85958887b3 (patch)
tree51ebf83194022e6635e19c89e4eae86d7edfd0ec
parent7029a4f409094fd59ea53508368e2dfb026a90b9 (diff)
parent9586201c1bfb8105eff683c23e5fe28378e59693 (diff)
downloadcryptography-0520c2973509f6a45d2ad06dc2d84a85958887b3.tar.gz
cryptography-0520c2973509f6a45d2ad06dc2d84a85958887b3.tar.bz2
cryptography-0520c2973509f6a45d2ad06dc2d84a85958887b3.zip
Merge pull request #1003 from reaperhulk/bump-version
bump version to 0.4
-rw-r--r--CHANGELOG.rst6
-rw-r--r--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 80ad8729..0826b0b1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,10 +1,8 @@
Changelog
=========
-0.4 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+0.4 - 2014-05-03
+~~~~~~~~~~~~~~~~
* Deprecated ``salt_length`` on
:class:`~cryptography.hazmat.primitives.asymmetric.padding.MGF1` and added it
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index ce0f32fc..d1151dc5 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -22,7 +22,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.4.dev1"
+__version__ = "0.4"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index ad61c1bc..606fa39d 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -22,7 +22,7 @@ __summary__ = "Test vectors for the cryptography package."
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.4.dev1"
+__version__ = "0.4"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"