From 2c1010ee96d73daf950ffff66bbd9b6718f2f0e9 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 7 Jul 2019 11:45:16 +0300 Subject: [PATCH] Drop support for EOL Python 3.4 --- .appveyor.yml | 2 -- .azure-pipelines/jobs/test-windows.yml | 6 ------ .azure-pipelines/jobs/test.yml | 3 --- .travis.yml | 4 ---- docs/html/installing.rst | 2 +- news/6685.removal | 1 + setup.py | 3 +-- src/pip/_internal/cli/base_command.py | 10 +--------- tox.ini | 2 +- 9 files changed, 5 insertions(+), 28 deletions(-) create mode 100644 news/6685.removal diff --git a/.appveyor.yml b/.appveyor.yml index f5bea1b6b13..4aa5e217bc3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,8 +7,6 @@ environment: RUN_INTEGRATION_TESTS: "True" # Unit tests only. - PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python34" - - PYTHON: "C:\\Python34-x64" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36" diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml index b8cb6044f11..752646247d0 100644 --- a/.azure-pipelines/jobs/test-windows.yml +++ b/.azure-pipelines/jobs/test-windows.yml @@ -32,9 +32,6 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - Python34-x64: - python.version: '3.4' - python.architecture: x64 Python35-x64: python.version: '3.5' python.architecture: x64 @@ -45,9 +42,6 @@ jobs: Python27-x86: python.version: '2.7' python.architecture: x86 - Python34-x86: - python.version: '3.4' - python.architecture: x86 Python35-x86: python.version: '3.5' python.architecture: x86 diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml index 7c51a26fc52..cadf99a51f7 100644 --- a/.azure-pipelines/jobs/test.yml +++ b/.azure-pipelines/jobs/test.yml @@ -29,9 +29,6 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - Python34: - python.version: '3.4' - python.architecture: x64 Python35: python.version: '3.5' python.architecture: x64 diff --git a/.travis.yml b/.travis.yml index bb64a6123cb..ba0775c49a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,10 +51,6 @@ jobs: python: 3.5 - env: GROUP=2 python: 3.5 - - env: GROUP=1 - python: 3.4 - - env: GROUP=2 - python: 3.4 - env: GROUP=1 python: 3.8-dev diff --git a/docs/html/installing.rst b/docs/html/installing.rst index 73f6f90b8e3..c15a62721fb 100644 --- a/docs/html/installing.rst +++ b/docs/html/installing.rst @@ -109,7 +109,7 @@ On Windows [4]_:: Python and OS Compatibility --------------------------- -pip works with CPython versions 2.7, 3.4, 3.5, 3.6, 3.7 and also pypy. +pip works with CPython versions 2.7, 3.5, 3.6, 3.7 and also PyPy. This means pip works on the latest patch version of each of these minor versions. Previous patch versions are supported on a best effort approach. diff --git a/news/6685.removal b/news/6685.removal new file mode 100644 index 00000000000..60e26e4692e --- /dev/null +++ b/news/6685.removal @@ -0,0 +1 @@ +Drop support for EOL Python 3.4. diff --git a/setup.py b/setup.py index e2e14b4965a..ed1f0109818 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,6 @@ def find_version(*file_paths): "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", @@ -79,5 +78,5 @@ def find_version(*file_paths): }, zip_safe=False, - 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.*', ) diff --git a/src/pip/_internal/cli/base_command.py b/src/pip/_internal/cli/base_command.py index 53b4cf73aab..f1dec95420d 100644 --- a/src/pip/_internal/cli/base_command.py +++ b/src/pip/_internal/cli/base_command.py @@ -152,15 +152,7 @@ def main(self, args): user_log_file=options.log, ) - if sys.version_info[:2] == (3, 4): - deprecated( - "Python 3.4 support has been deprecated. pip 19.1 will be the " - "last one supporting it. Please upgrade your Python as Python " - "3.4 won't be maintained after March 2019 (cf PEP 429).", - replacement=None, - gone_in='19.2', - ) - elif sys.version_info[:2] == (2, 7): + if sys.version_info[:2] == (2, 7): message = ( "A future version of pip will drop support for Python 2.7." ) diff --git a/tox.ini b/tox.ini index 5b5b0174fb5..402e96bad23 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ minversion = 3.4.0 envlist = docs, packaging, lint-py2, lint-py3, mypy, - py27, py34, py35, py36, py37, py38, pypy, pypy3 + py27, py35, py36, py37, py38, pypy, pypy3 [helpers] # Wrapper for calls to pip that make sure the version being used is the