diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-29 21:12:46 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-29 21:12:46 -0700 |
| commit | 3a660c05aa99a4bbd0293eebff9d6d4d42560710 (patch) | |
| tree | d632e6c754e44f3217a8988f0797f9655a9a825d | |
| parent | b2ab5ef112f8de507d2db72fdf4a5fa698a954e0 (diff) | |
| parent | 98681338df32ade2868487fb800af0cef1a30d91 (diff) | |
| download | cryptography-3a660c05aa99a4bbd0293eebff9d6d4d42560710.tar.gz cryptography-3a660c05aa99a4bbd0293eebff9d6d4d42560710.tar.bz2 cryptography-3a660c05aa99a4bbd0293eebff9d6d4d42560710.zip | |
Merge pull request #1370 from reaperhulk/master-open-for-business
open master for seventh release development
| -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 f7e34832..8258279b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +0.7 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 0.6 - 2014-09-29 ~~~~~~~~~~~~~~~~ diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 65c28fb0..77320b95 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" +__version__ = "0.7.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 af8ec170..fb89b01c 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" +__version__ = "0.7.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |