diff options
| -rw-r--r-- | CHANGELOG.rst | 8 | ||||
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | src/cryptography/x509/general_name.py | 1 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_ec.py | 1 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_scrypt.py | 1 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
7 files changed, 11 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fb68bb9e2..cf6836528 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog ========= +.. _v2-1-3: + +2.1.3 - 2017-11-02 +~~~~~~~~~~~~~~~~~~ + +* Updated Windows, macOS, and ``manylinux1`` wheels to be compiled with + OpenSSL 1.1.0g. + .. _v2-1-2: 2.1.2 - 2017-10-24 diff --git a/Jenkinsfile b/Jenkinsfile index 11cbfd75c..af7467a28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,7 +46,7 @@ def configs = [ [ label: 'docker', imageName: 'pyca/cryptography-runner-buster', - toxenvs: ['py27', 'py35'], + toxenvs: ['py27', 'py36'], ], [ label: 'docker', diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py index a335c537c..b0df09716 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__ = "2.1.2" +__version__ = "2.1.3" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/src/cryptography/x509/general_name.py b/src/cryptography/x509/general_name.py index 776219e2a..65ba75c23 100644 --- a/src/cryptography/x509/general_name.py +++ b/src/cryptography/x509/general_name.py @@ -12,7 +12,6 @@ from email.utils import parseaddr import idna import six - from six.moves import urllib_parse from cryptography import utils diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py index 82cf2fae8..f493869d7 100644 --- a/tests/hazmat/primitives/test_ec.py +++ b/tests/hazmat/primitives/test_ec.py @@ -7,7 +7,6 @@ from __future__ import absolute_import, division, print_function import binascii import itertools import os - from binascii import hexlify import pytest diff --git a/tests/hazmat/primitives/test_scrypt.py b/tests/hazmat/primitives/test_scrypt.py index 87aee1f1d..64abfe798 100644 --- a/tests/hazmat/primitives/test_scrypt.py +++ b/tests/hazmat/primitives/test_scrypt.py @@ -5,7 +5,6 @@ from __future__ import absolute_import, division, print_function import binascii - import os import pytest diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 04c6fe201..4e5d2c96d 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__ = "2.1.2" +__version__ = "2.1.3" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |