Skip to content

Commit

Permalink
Drop support for Python 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dstufft committed May 17, 2018
1 parent 70253c2 commit 90b3db4
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 32 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
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"
Expand Down
2 changes: 1 addition & 1 deletion docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions news/3796.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dropped support for Python 3.3.
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def find_version(*file_paths):
"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",
Expand Down Expand Up @@ -83,7 +82,7 @@ def find_version(*file_paths):
},
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,
},
Expand Down
9 changes: 0 additions & 9 deletions src/pip/_internal/basecommand.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import optparse
import os
import sys
import warnings

from pip._internal import cmdoptions
from pip._internal.baseparser import (
Expand All @@ -26,7 +25,6 @@
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
Expand Down Expand Up @@ -198,13 +196,6 @@ def main(self, args):
},
})

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.

Expand Down
12 changes: 1 addition & 11 deletions tests/functional/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand All @@ -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
)


Expand All @@ -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]
Expand Down
3 changes: 0 additions & 3 deletions tests/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,6 @@ def pip(self, *args, **kwargs):
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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[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
Expand Down

0 comments on commit 90b3db4

Please sign in to comment.