diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-12 09:30:55 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-12 09:30:55 -0400 |
| commit | 4abba0474a751192b5abbd5a97c1817021aae337 (patch) | |
| tree | 3a591713650e03c397b54cc6aaf1d9f260d157c6 | |
| parent | 7865d9d3e0da44c5ab181f89d5fef275df61be6f (diff) | |
| parent | 55ab805cf8fae5b347f71ce78fb80b081ddf9a8c (diff) | |
| download | cryptography-4abba0474a751192b5abbd5a97c1817021aae337.tar.gz cryptography-4abba0474a751192b5abbd5a97c1817021aae337.tar.bz2 cryptography-4abba0474a751192b5abbd5a97c1817021aae337.zip | |
Merge pull request #2266 from reaperhulk/10-release
bump versions and release 1.0
| -rw-r--r-- | CHANGELOG.rst | 4 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 99c0884a..21319f8b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,9 @@ Changelog ========= -1.0 - `master`_ +1.0 - 2015-08-12 ~~~~~~~~~~~~~~~~ -.. note:: This version is not yet released and is under active development. - * Switched to the new `cffi`_ ``set_source`` out-of-line API mode for compilation. This results in significantly faster imports and lowered memory consumption. Due to this change we no longer support PyPy releases diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index 9c28be2e..ec537e15 100644 --- a/src/cryptography/__about__.py +++ b/src/cryptography/__about__.py @@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes" " and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "1.0.dev1" +__version__ = "1.0" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index a8199ced..13fe152e 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package." __uri__ = "https://github.com/pyca/cryptography" -__version__ = "1.0.dev1" +__version__ = "1.0" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |