From f6c96af9b8ae4634ebdfebf7972379297c5e5604 Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Thu, 20 Apr 2017 12:34:58 +0200 Subject: Prepare for 17.0.0 (#615) * Prepare for 17.0.0 Fix a bunch URLs and account for the non-existance of 16.3. * Fix codecov link --- CHANGELOG.rst | 4 ++-- INSTALL.rst | 4 ++-- README.rst | 2 +- src/OpenSSL/crypto.py | 2 +- src/OpenSSL/version.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6ef6f7b..e5e01c6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,7 @@ Versions are year-based with a strict backward-compatibility policy. The third digit is only for regressions. -16.3.0 (UNRELEASED) +17.0.0 (UNRELEASED) ------------------- Backward-incompatible changes: @@ -105,7 +105,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 `pytest `_, all CI test runs are part of `tox `_ and the source code has been made fully `flake8 `_ compliant. +It has been moved to `pytest `_, all CI test runs are part of `tox `_ and the source code has been made fully `flake8 `_ compliant. We hope to have lowered the barrier for contributions significantly but are open to hear about any remaining frustrations. diff --git a/INSTALL.rst b/INSTALL.rst index 65535e4..d6c9410 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -32,8 +32,8 @@ Currently that means: If you need support for older releases, the following pinned versions will work: -- **OpenSSL 0.9.8**: ``'pyOpenSSL<16.3' 'cryptography<1.4'`` -- **OpenSSL 1.0.0**: ``'pyOpenSSL<17.0' 'cryptography<1.7'`` +- **OpenSSL 0.9.8**: ``'pyOpenSSL<17.0' 'cryptography<1.4'`` +- **OpenSSL 1.0.0**: ``'pyOpenSSL<17.1' 'cryptography<1.7'`` Documentation diff --git a/README.rst b/README.rst index 6fe3df7..0a0f84e 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ pyOpenSSL -- A Python wrapper around the OpenSSL library :target: https://travis-ci.org/pyca/pyopenssl :alt: Build status -.. image:: https://codecov.io/github/pyca/pyopenssl/coverage.svg?branch=master +.. image:: https://codecov.io/github/pyca/pyopenssl/branch/master/graph/badge.svg :target: https://codecov.io/github/pyca/pyopenssl :alt: Test coverage diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py index 165f918..b90f0e4 100644 --- a/src/OpenSSL/crypto.py +++ b/src/OpenSSL/crypto.py @@ -1538,7 +1538,7 @@ class X509Store(object): For example, you can determine if a certificate was valid at a given time. - .. versionadded:: 16.3.0 + .. versionadded:: 17.0.0 :param datetime vfy_time: The verification time to set on this store. :return: ``None`` if the verification time was successfully set. diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py index 388cf08..0a61385 100644 --- a/src/OpenSSL/version.py +++ b/src/OpenSSL/version.py @@ -11,7 +11,7 @@ __all__ = [ "__title__", "__uri__", "__version__", ] -__version__ = "16.3.0.dev0" +__version__ = "17.0.0.dev0" __title__ = "pyOpenSSL" __uri__ = "https://pyopenssl.readthedocs.io/" @@ -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-2016 {0}".format(__author__) +__copyright__ = "Copyright 2001-2017 {0}".format(__author__) -- cgit v1.2.1