diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-03 08:27:52 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-03 08:27:52 -0700 |
commit | bac18fcdbba52a7f2f9f73f43f4e2fcc6e84cdfb (patch) | |
tree | 4765bc6aebd47906a84d68a007ab9a552c96b6d4 | |
parent | 0520c2973509f6a45d2ad06dc2d84a85958887b3 (diff) | |
parent | 50a048536c5443a86e47a967dadf38bc4241b593 (diff) | |
download | cryptography-bac18fcdbba52a7f2f9f73f43f4e2fcc6e84cdfb.tar.gz cryptography-bac18fcdbba52a7f2f9f73f43f4e2fcc6e84cdfb.tar.bz2 cryptography-bac18fcdbba52a7f2f9f73f43f4e2fcc6e84cdfb.zip |
Merge pull request #1004 from reaperhulk/reopen-master
update versions and reopen master
-rw-r--r-- | CHANGELOG.rst | 5 | ||||
-rw-r--r-- | cryptography/__about__.py | 2 | ||||
-rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0826b0b1..54d6229f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +0.5 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 0.4 - 2014-05-03 ~~~~~~~~~~~~~~~~ diff --git a/cryptography/__about__.py b/cryptography/__about__.py index d1151dc5..ee53902b 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" +__version__ = "0.5.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 606fa39d..bbacbf5d 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" +__version__ = "0.5.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |