diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-29 19:17:41 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-29 19:17:41 -0700 |
| commit | b2ab5ef112f8de507d2db72fdf4a5fa698a954e0 (patch) | |
| tree | 800825605ab6be0e4b97e4937c35a21afe5f60e9 | |
| parent | 9952434588fbadc9e0e5624f1821064dd0fbadff (diff) | |
| parent | c3f11d806370ae66da5ad8af42bc7bff950b4199 (diff) | |
| download | cryptography-b2ab5ef112f8de507d2db72fdf4a5fa698a954e0.tar.gz | |
Merge pull request #1369 from reaperhulk/sixth-release0.6
Bump version and set changelog date for 0.6 release
| -rw-r--r-- | CHANGELOG.rst | 6 | ||||
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 655774985..f7e348329 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,8 @@ Changelog ========= -0.6 - `master`_ -~~~~~~~~~~~~~~~ - -.. note:: This version is not yet released and is under active development. +0.6 - 2014-09-29 +~~~~~~~~~~~~~~~~ * Added :func:`~cryptography.hazmat.primitives.serialization.load_pem_private_key` to diff --git a/cryptography/__about__.py b/cryptography/__about__.py index eb022fbd0..65c28fb05 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.6.dev1" +__version__ = "0.6" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index a8dab84d8..af8ec170c 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.6.dev1" +__version__ = "0.6" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |