diff options
author | Cory Benfield <lukasaoz@gmail.com> | 2016-01-19 13:36:30 +0000 |
---|---|---|
committer | Cory Benfield <lukasaoz@gmail.com> | 2016-01-19 13:36:30 +0000 |
commit | 8acb3af69d114ba438aab702a0318d1a8620e424 (patch) | |
tree | 3ac407007f12fc3645f78d03ee98976769b0213b | |
parent | 9b73a6d6f9d453a954618a3b191ec9261f0aa939 (diff) | |
parent | 0cc615430d58f7bb0936840c5b10cb0530e3885a (diff) | |
download | pyopenssl-git-8acb3af69d114ba438aab702a0318d1a8620e424.tar.gz |
Merge pull request #412 from hynek/master
2016 snook up on us
-rw-r--r-- | CHANGELOG.rst | 8 | ||||
-rw-r--r-- | setup.cfg | 2 | ||||
-rw-r--r-- | src/OpenSSL/rand.py | 4 | ||||
-rw-r--r-- | src/OpenSSL/version.py | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index de22101..d3f1c9a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,13 +5,13 @@ Versions are year-based with a strict :doc:`backward-compatibility` policy. The third digit is only for regressions. -15.2.0 (UNRELEASED) +16.0.0 (UNRELEASED) ------------------- This is the first release under full stewardship of PyCA. We have made *many* changes to make local development more pleasing. The test suite now passes both on Linux and OS X with OpenSSL 0.9.8, 1.0.1, and 1.0.2. -It has been moved to `py.test <http://pytest.org/latest/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.org/en/>`_ compliant. +It has been moved to `py.test <http://pytest.org/>`_, all CI test runs are part of `tox <https://testrun.org/tox/>`_ and the source code has been made fully `flake8 <https://flake8.readthedocs.org/>`_ compliant. We hope to have lowered the barrier for contributions significantly but are open to hear about any remaining frustrations. @@ -34,7 +34,7 @@ Deprecations: Please note that you should `use urandom <http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/>`_ for all your secure random number needs. -In accordance with our backward compatibility policy :func:`OpenSSL.rand.egd` will be *removed* no sooner than a year from the release of 15.2.0 +In accordance with our backward compatibility policy :func:`OpenSSL.rand.egd` will be *removed* no sooner than a year from the release of 16.0.0. Changes: @@ -64,4 +64,4 @@ Changes: Older Changelog Entries ----------------------- -The changes from before release 15.2.0 are preserved in the `repository <https://github.com/pyca/pyopenssl/blob/master/doc/ChangeLog_old.txt>`_. +The changes from before release 16.0.0 are preserved in the `repository <https://github.com/pyca/pyopenssl/blob/master/doc/ChangeLog_old.txt>`_. @@ -1,7 +1,7 @@ [pytest] minversion = 2.8.2 strict = true -norecursedirs = build dist .* *.egg doc _trial_temp +testpaths = tests [sdist] force_manifest=1 diff --git a/src/OpenSSL/rand.py b/src/OpenSSL/rand.py index c12638f..087b243 100644 --- a/src/OpenSSL/rand.py +++ b/src/OpenSSL/rand.py @@ -118,7 +118,7 @@ def egd(path, bytes=_unspecified): Does *not* actually query the EGD. - .. deprecated:: 15.2.0 + .. deprecated:: 16.0.0 EGD was only necessary for some commercial UNIX systems that all reached their ends of life more than a decade ago. See `pyca/cryptography#1636 @@ -129,7 +129,7 @@ def egd(path, bytes=_unspecified): :returns: ``len(bytes)`` or 255 if not specified. """ - warnings.warn("OpenSSL.rand.egd() is deprecated as of 15.2.0.", + warnings.warn("OpenSSL.rand.egd() is deprecated as of 16.0.0.", DeprecationWarning) if not isinstance(path, _builtin_bytes): diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py index 02c5fc3..71c1fb4 100644 --- a/src/OpenSSL/version.py +++ b/src/OpenSSL/version.py @@ -11,7 +11,7 @@ __all__ = [ "__title__", "__uri__", "__version__", ] -__version__ = "15.2.0.dev0" +__version__ = "16.0.0.dev0" __title__ = "pyOpenSSL" __uri__ = "https://github.com/pyca/pyopenssl" @@ -19,4 +19,4 @@ __summary__ = "Python wrapper module around the OpenSSL library" __author__ = "The pyOpenSSL developers" __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" -__copyright__ = "Copyright 2001-2015 {0}".format(__author__) +__copyright__ = "Copyright 2001-2016 {0}".format(__author__) |