diff options
-rw-r--r-- | CHANGELOG.rst | 7 | ||||
-rw-r--r-- | CONTRIBUTING.rst | 4 | ||||
-rw-r--r-- | doc/api/rand.rst | 2 | ||||
-rw-r--r-- | doc/api/ssl.rst | 2 | ||||
-rw-r--r-- | src/OpenSSL/crypto.py | 2 | ||||
-rw-r--r-- | src/OpenSSL/version.py | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b86211d..2962dd7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,7 @@ Changelog Versions are year-based with a strict backward-compatibility policy. The third digit is only for regressions. -16.2.0 (UNRELEASED) +16.2.0 (2016-10-15) ------------------- Backward-incompatible changes: @@ -26,6 +26,7 @@ Changes: - Fixed an issue that caused failures with subinterpreters and embedded Pythons. `#552 <https://github.com/pyca/pyopenssl/pull/552>`_ + ---- @@ -65,7 +66,7 @@ Changes: 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 <https://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.io/>`_ compliant. +It has been moved to `pytest <https://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.io/>`_ compliant. We hope to have lowered the barrier for contributions significantly but are open to hear about any remaining frustrations. @@ -86,7 +87,7 @@ Deprecations: Please see `pyca/cryptography#1636 <https://github.com/pyca/cryptography/pull/1636>`_ for more background information on this decision. In accordance with our backward compatibility policy ``OpenSSL.rand.egd()`` will be *removed* no sooner than a year from the release of 16.0.0. - 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. + Please note that you should `use urandom <https://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/>`_ for all your secure random number needs. - Python 2.6 support has been deprecated. Our main dependency ``cryptography`` deprecated 2.6 in version 0.9 (2015-05-14) with no time table for actually dropping it. pyOpenSSL will drop Python 2.6 support once ``cryptography`` does. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 558e142..8539f61 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -28,7 +28,7 @@ Code Create different pull requests for unrelated features or bugfixes. - Code should follow `PEP 8`_, especially in the "do what code around you does" sense. Follow OpenSSL naming for callables whenever possible is preferred. -- New tests should use `py.test-style assertions`_ instead of the old ``self.assertXYZ``-style. +- New tests should use `pytest-style assertions`_ instead of the old ``self.assertXYZ``-style. - Pull requests that introduce code must test all new behavior they introduce as well as for previously untested or poorly tested behavior that they touch. - Pull requests are not allowed to break existing tests. We usually don't comment on pull requests that are breaking the CI because we consider them work in progress. @@ -111,7 +111,7 @@ Feel free to cross-check this information with Keybase_. .. _Keybase: https://keybase.io/hynek .. _pyca/pyopenssl: https://github.com/pyca/pyopenssl .. _PEP 8: https://www.python.org/dev/peps/pep-0008/ -.. _py.test-style assertions: https://pytest.org/latest/assert.html +.. _pytest-style assertions: http://docs.pytest.org/en/latest/assert.html .. _cryptography code review process: https://cryptography.io/en/latest/development/reviewing-patches/ .. _freenode: https://freenode.net .. _mailing list: https://mail.python.org/mailman/listinfo/cryptography-dev diff --git a/doc/api/rand.rst b/doc/api/rand.rst index 9c86ae6..83aec1e 100644 --- a/doc/api/rand.rst +++ b/doc/api/rand.rst @@ -5,7 +5,7 @@ .. warning:: Functions from this module shouldn't be used. - `Use urandom <http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/>`_ instead. + `Use urandom <https://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/>`_ instead. .. py:module:: OpenSSL.rand diff --git a/doc/api/ssl.rst b/doc/api/ssl.rst index 0edf1ab..00cae9b 100644 --- a/doc/api/ssl.rst +++ b/doc/api/ssl.rst @@ -465,7 +465,7 @@ Context objects have the following methods: Specify a callback function that will be called when offering `Next Protocol Negotiation - <https://technotes.googlecode.com/git/nextprotoneg.html>`_ as a server. + <https://tools.ietf.org/html/draft-agl-tls-nextprotoneg-03>`_ as a server. *callback* should be the callback function. It will be invoked with one argument, the :py:class:`Connection` instance. It should return a list of diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py index 61bddb6..52fcdaf 100644 --- a/src/OpenSSL/crypto.py +++ b/src/OpenSSL/crypto.py @@ -680,7 +680,7 @@ class X509Extension(object): :param issuer: Optional X509 certificate to use as issuer. :type issuer: :py:class:`X509` - .. _extension: https://openssl.org/docs/manmaster/apps/ + .. _extension: https://www.openssl.org/docs/manmaster/apps/ x509v3_config.html#STANDARD-EXTENSIONS """ ctx = _ffi.new("X509V3_CTX*") diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py index d2912b9..29103d2 100644 --- a/src/OpenSSL/version.py +++ b/src/OpenSSL/version.py @@ -11,7 +11,7 @@ __all__ = [ "__title__", "__uri__", "__version__", ] -__version__ = "16.2.0.dev0" +__version__ = "16.2.0" __title__ = "pyOpenSSL" __uri__ = "https://pyopenssl.readthedocs.io/" |