提交 90b3db47 编写于 作者: D Donald Stufft

Drop support for Python 3.3

上级 70253c21
......@@ -22,8 +22,6 @@ matrix:
- env: TOXENV=py36
python: 3.6
# All the other Py3 versions
- env: TOXENV=py33
python: 3.3
- env: TOXENV=py34
python: 3.4
- env: TOXENV=py35
......
environment:
matrix:
# Unit and integration tests.
# Unit and integration tests.
- PYTHON: "C:\\Python27"
RUN_INTEGRATION_TESTS: "True"
- PYTHON: "C:\\Python36-x64"
RUN_INTEGRATION_TESTS: "True"
# Unit tests only.
- PYTHON: "C:\\Python27-x64"
- PYTHON: "C:\\Python33"
- PYTHON: "C:\\Python33-x64"
- PYTHON: "C:\\Python34"
- PYTHON: "C:\\Python34-x64"
- PYTHON: "C:\\Python35"
......
......@@ -102,7 +102,7 @@ On Windows [4]_::
Python and OS Compatibility
---------------------------
pip works with CPython versions 2.7, 3.3, 3.4, 3.5, 3.6 and also pypy.
pip works with CPython versions 2.7, 3.4, 3.5, 3.6 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.
......
Dropped support for Python 3.3.
......@@ -51,7 +51,6 @@ setup(
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
......@@ -83,7 +82,7 @@ setup(
},
tests_require=tests_require,
zip_safe=False,
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
extras_require={
'testing': tests_require,
},
......
......@@ -6,7 +6,6 @@ import logging.config
import optparse
import os
import sys
import warnings
from pip._internal import cmdoptions
from pip._internal.baseparser import (
......@@ -26,7 +25,6 @@ from pip._internal.status_codes import (
ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR,
VIRTUALENV_NOT_FOUND,
)
from pip._internal.utils import deprecation
from pip._internal.utils.logging import IndentingFormatter
from pip._internal.utils.misc import get_prog, normalize_path
from pip._internal.utils.outdated import pip_version_check
......@@ -198,13 +196,6 @@ class Command(object):
},
})
if sys.version_info[:2] == (3, 3):
warnings.warn(
"Python 3.3 support has been deprecated and will be dropped "
"in the future. Please upgrade your Python.",
deprecation.RemovedInPip11Warning,
)
# TODO: try to get these passing down from the command?
# without resorting to os.environ to hold these.
......
......@@ -32,16 +32,11 @@ def test_pep518_uses_build_env(script, data, original_setuptools):
raise ValueError(original_setuptools)
to_install = data.src.join("pep518-3.0")
for command in ('install', 'wheel'):
kwargs = {}
if sys.version_info[:2] == (3, 3):
# Ignore Python 3.3 deprecation warning...
kwargs['expect_stderr'] = True
script.run(
"python", "-c",
"import pip._internal; pip._internal.main(["
"%r, " "'-f', %r, " "%r, "
"])" % (command, str(data.packages), str(to_install)),
**kwargs
)
......@@ -55,16 +50,11 @@ def test_pep518_with_user_pip(script, virtualenv, pip_src, data):
fp.write('raise ImportError\n')
to_install = data.src.join("pep518-3.0")
for command in ('install', 'wheel'):
kwargs = {}
if sys.version_info[:2] == (3, 3):
# Ignore Python 3.3 deprecation warning...
kwargs['expect_stderr'] = True
script.run(
"python", "-c",
"import pip._internal; pip._internal.main(["
"%r, " "'-f', %r, " "%r, "
"])" % (command, str(data.packages), str(to_install)),
**kwargs
)
......@@ -76,7 +66,7 @@ def test_pip_second_command_line_interface_works(script, data):
# On old versions of Python, urllib3/requests will raise a warning about
# the lack of an SSLContext.
kwargs = {}
if pyversion_tuple < (2, 7, 9) or pyversion_tuple[:2] == (3, 3):
if pyversion_tuple < (2, 7, 9):
kwargs['expect_stderr'] = True
args = ['pip%s' % pyversion]
......
......@@ -372,9 +372,6 @@ class PipTestEnvironment(scripttest.TestFileEnvironment):
if (pyversion_tuple < (2, 7, 9) and
args and args[0] in ('search', 'install', 'download')):
kwargs['expect_stderr'] = True
# Python 3.3 is deprecated and we emit a warning on it.
if pyversion_tuple[:2] == (3, 3):
kwargs['expect_stderr'] = True
if kwargs.pop('use_module', False):
exe = 'python'
args = ('-m', 'pip') + args
......
[tox]
envlist =
docs, packaging, lint-py2, lint-py3, mypy,
py27, py33, py34, py35, py36, py37, pypy
py27, py34, py35, py36, py37, pypy
[testenv]
passenv = CI GIT_SSL_CAINFO
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册