aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.azure-pipelines/wheel-builder.yml16
-rw-r--r--.travis.yml7
-rw-r--r--CHANGELOG.rst8
-rw-r--r--azure-pipelines.yml12
-rw-r--r--docs/development/getting-started.rst2
-rw-r--r--docs/faq.rst6
-rw-r--r--docs/installation.rst4
-rw-r--r--setup.py3
-rw-r--r--tox.ini4
9 files changed, 18 insertions, 44 deletions
diff --git a/.azure-pipelines/wheel-builder.yml b/.azure-pipelines/wheel-builder.yml
index d07967da..3f7e4d1a 100644
--- a/.azure-pipelines/wheel-builder.yml
+++ b/.azure-pipelines/wheel-builder.yml
@@ -12,7 +12,7 @@ jobs:
PYTHON_DOWNLOAD_URL: "https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg"
PYTHON_BIN_PATH: /Library/Frameworks/Python.framework/Versions/2.7/bin/python
Python3:
- python.version: '3.4'
+ python.version: '3.5'
PYTHON_DOWNLOAD_URL: "https://www.python.org/ftp/python/3.7.3/python-3.7.3-macosx10.6.pkg"
PYTHON_BIN_PATH: /Library/Frameworks/Python.framework/Versions/3.7/bin/python3
steps:
@@ -87,7 +87,7 @@ jobs:
PLATFORM: 'manylinux1_x86_64'
Python3m-manylinux1:
containerImage: 'pyca/cryptography-manylinux1:x86_64'
- PYTHON_VERSION: 'cp34-cp34m'
+ PYTHON_VERSION: 'cp35-cp35m'
PLATFORM: 'manylinux1_x86_64'
Python27m-manylinux2010:
containerImage: 'pyca/cryptography-manylinux2010:x86_64'
@@ -99,7 +99,7 @@ jobs:
PLATFORM: 'manylinux2010_x86_64'
Python3m-manylinux2010:
containerImage: 'pyca/cryptography-manylinux2010:x86_64'
- PYTHON_VERSION: 'cp34-cp34m'
+ PYTHON_VERSION: 'cp35-cp35m'
PLATFORM: 'manylinux2010_x86_64'
steps:
- script: /opt/python/$PYTHON_VERSION/bin/python -m virtualenv .venv
@@ -164,16 +164,6 @@ jobs:
PYTHON_VERSION: '27'
OPENSSL_DIR: 'OpenSSL-Win64-2010'
WINDOWS_ARCH: 'x86_64'
- Python34-x86:
- containerImage: 'pyca/cryptography-runner-windows:py34-x86'
- PYTHON_VERSION: '34'
- OPENSSL_DIR: 'OpenSSL-Win32-2010'
- WINDOWS_ARCH: 'x86'
- Python34-x86-64:
- containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
- PYTHON_VERSION: '34'
- OPENSSL_DIR: 'OpenSSL-Win64-2010'
- WINDOWS_ARCH: 'x86_64'
Python35-x86:
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
PYTHON_VERSION: '35'
diff --git a/.travis.yml b/.travis.yml
index 1cb3f655..8d4bd407 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,11 @@ branches:
matrix:
include:
- - python: 3.4
+ - python: 3.8
env: TOXENV=pep8
# Setting 'python' is just to make travis's UI a bit prettier
- python: 2.7
env: TOXENV=py27
- - python: 3.4
- env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
@@ -74,9 +72,6 @@ matrix:
- python: 2.7
services: docker
env: TOXENV=py27 DOCKER=pyca/cryptography-runner-jessie
- - python: 3.4
- services: docker
- env: TOXENV=py34 DOCKER=pyca/cryptography-runner-jessie
- python: 2.7
services: docker
env: TOXENV=py27 DOCKER=pyca/cryptography-runner-stretch
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f142dde5..31430d75 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,9 +8,11 @@ Changelog
.. note:: This version is not yet released and is under active development.
-* Support for OpenSSL 1.0.1 has been removed. Users on older version of OpenSSL
- will need to upgrade.
-* Support for LibreSSL 2.6.x has been removed.
+* **BACKWARDS INCOMPATIBLE:** Support for Python 3.4 has been removed due to
+ low usage and maintenance burden.
+* **BACKWARDS INCOMPATIBLE:** Support for OpenSSL 1.0.1 has been removed.
+ Users on older version of OpenSSL will need to upgrade.
+* **BACKWARDS INCOMPATIBLE:** Support for LibreSSL 2.6.x has been removed.
* Removed support for calling
:meth:`~cryptography.hazmat.primitives.asymmetric.x25519.X25519PublicKey.public_bytes`
with no arguments, as per our deprecation policy. You must now pass
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 398267d2..3b279344 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -82,18 +82,6 @@ jobs:
OPENSSL_DIR: 'OpenSSL-Win64-2010'
PYTHON_DIR: 'Python27'
WINDOWS_ARCH: 'x86_64'
- Python34-x86:
- TOXENV: py34
- containerImage: 'pyca/cryptography-runner-windows:py34-x86'
- OPENSSL_DIR: 'OpenSSL-Win32-2010'
- PYTHON_DIR: 'Python34'
- WINDOWS_ARCH: 'x86'
- Python34-x86-64:
- TOXENV: py34
- containerImage: 'pyca/cryptography-runner-windows:py34-x86_64'
- OPENSSL_DIR: 'OpenSSL-Win64-2010'
- PYTHON_DIR: 'Python34'
- WINDOWS_ARCH: 'x86_64'
Python35-x86:
TOXENV: py35
containerImage: 'pyca/cryptography-runner-windows:py35-x86'
diff --git a/docs/development/getting-started.rst b/docs/development/getting-started.rst
index cc333e4d..1d939a9c 100644
--- a/docs/development/getting-started.rst
+++ b/docs/development/getting-started.rst
@@ -81,7 +81,7 @@ each supported Python version and run the tests. For example:
...
py27: commands succeeded
ERROR: pypy: InterpreterNotFound: pypy
- py34: commands succeeded
+ py38: commands succeeded
docs: commands succeeded
pep8: commands succeeded
diff --git a/docs/faq.rst b/docs/faq.rst
index 235da672..de131f67 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -104,12 +104,12 @@ Since they are no longer receiving security patches from upstream,
should upgrade to a newer version of OpenSSL (1.0.2 or later). This may require
you to upgrade to a newer operating system.
-Why are there no wheels for Python 3.5+ on Linux or macOS?
+Why are there no wheels for Python 3.6+ on Linux or macOS?
----------------------------------------------------------
Our Python3 wheels, for macOS and Linux, are ``abi3`` wheels. This means they
-support multiple versions of Python. The Python 3.4 ``abi3`` wheel can be used
-with any version of Python greater than or equal to 3.4. Recent versions of
+support multiple versions of Python. The Python 3.5 ``abi3`` wheel can be used
+with any version of Python greater than or equal to 3.5. Recent versions of
``pip`` will automatically install ``abi3`` wheels.
``ImportError``: ``idna`` is not installed
diff --git a/docs/installation.rst b/docs/installation.rst
index a5881bd9..655adf2d 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -10,7 +10,7 @@ You can install ``cryptography`` with ``pip``:
Supported platforms
-------------------
-Currently we test ``cryptography`` on Python 2.7, 3.4+, and
+Currently we test ``cryptography`` on Python 2.7, 3.5+, and
PyPy 5.4+ on these operating systems.
* x86-64 CentOS 7.x
@@ -49,7 +49,7 @@ just run
If you prefer to compile it yourself you'll need to have OpenSSL installed.
You can compile OpenSSL yourself as well or use `a binary distribution`_.
Be sure to download the proper version for your architecture and Python
-(VC2010 works for Python 2.7, 3.3, and 3.4 while VC2015 is required for 3.5 and above).
+(VC2010 works for Python 2.7 while VC2015 is required for 3.5 and above).
Wherever you place your copy of OpenSSL you'll need to set the ``LIB`` and ``INCLUDE``
environment variables to include the proper locations. For example:
diff --git a/setup.py b/setup.py
index ae01916b..a5bbfa1e 100644
--- a/setup.py
+++ b/setup.py
@@ -217,7 +217,6 @@ setup(
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
@@ -231,7 +230,7 @@ setup(
packages=find_packages(where="src", exclude=["_cffi_src", "_cffi_src.*"]),
include_package_data=True,
- python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+ python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
install_requires=[
"six >= 1.4.1",
diff --git a/tox.ini b/tox.ini
index 6c414973..ee7793f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.4
-envlist = py27,pypy,py34,py35,py36,py37,py38,docs,pep8,packaging
+envlist = py27,pypy,py35,py36,py37,py38,docs,pep8,packaging
isolated_build = True
[testenv]
@@ -18,7 +18,7 @@ setenv =
commands =
pip list
# We use parallel mode and then combine here so that coverage.py will take
- # the paths like .tox/py34/lib/python3.4/site-packages/cryptography/__init__.py
+ # the paths like .tox/py38/lib/python3.8/site-packages/cryptography/__init__.py
# and collapse them into src/cryptography/__init__.py.
coverage run --parallel-mode -m pytest --capture=no --strict {posargs}
coverage combine
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 19:06:43 +0000