aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst5
-rw-r--r--cryptography/__about__.py2
-rw-r--r--setup.py1
-rw-r--r--tox.ini1
-rw-r--r--vectors/cryptography_vectors/__about__.py2
5 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index aed02c56..34c544d9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,11 +1,14 @@
Changelog
=========
-0.3 - `master`_
+0.4 - `master`_
~~~~~~~~~~~~~~~
.. note:: This version is not yet released and is under active development.
+0.3 - 2014-03-27
+~~~~~~~~~~~~~~~~
+
* Added :class:`~cryptography.hazmat.primitives.twofactor.hotp.HOTP`.
* Added :class:`~cryptography.hazmat.primitives.twofactor.totp.TOTP`.
* Added :class:`~cryptography.hazmat.primitives.ciphers.algorithms.IDEA` support.
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index b175824f..ce0f32fc 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.3.dev1"
+__version__ = "0.4.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/setup.py b/setup.py
index eb1b3d37..ccb1e5f6 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@ requirements = [
SIX_DEPENDENCY
]
+# If you add a new dep here you probably need to add it in the tox.ini as well
test_requirements = [
"pytest",
"pretend",
diff --git a/tox.ini b/tox.ini
index eb8e2750..78b8b4c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
envlist = py26,py27,pypy,py32,py33,py34,docs,pep8,py3pep8
[testenv]
+# If you add a new dep here you probably need to add it in setup.py as well
deps =
coverage
iso8601
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 8d07fd0f..ad61c1bc 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.3.dev1"
+__version__ = "0.4.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"