diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-27 15:38:40 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-27 15:38:40 -0700 |
| commit | 924dadd01a9975ce2f5b62ba93a5e0e648b7ab27 (patch) | |
| tree | 427de4cef4069b4ff8e48bafde5356cc1ad15a0e | |
| parent | e0d2e1ea7367e05197634c8c869678b7b169c102 (diff) | |
| parent | 3d4eb6e3831184a97b490cd36f358a29a700eca5 (diff) | |
| download | cryptography-924dadd01a9975ce2f5b62ba93a5e0e648b7ab27.tar.gz cryptography-924dadd01a9975ce2f5b62ba93a5e0e648b7ab27.tar.bz2 cryptography-924dadd01a9975ce2f5b62ba93a5e0e648b7ab27.zip | |
Merge pull request #853 from reaperhulk/reopen-master
update versions for 0.4.dev1 and add boilerplate to changelog
| -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 a6d1619f..34c544d9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +0.4 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + 0.3 - 2014-03-27 ~~~~~~~~~~~~~~~~ diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 492fe10a..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" +__version__ = "0.4.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 2a22c0a2..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" +__version__ = "0.4.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |