Skip to content

Commit 71151fa

Browse files
pradyunsgpradyunsg
authored
Merge pull request #10641 from hugovk/rm-3.6
2 parents d81c65a + 7c9da5f commit 71151fa

File tree

13 files changed

+40
-234
lines changed

13 files changed

+40
-234
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,10 @@ jobs:
102102
matrix:
103103
os: [Ubuntu, MacOS]
104104
python:
105-
- 3.6
106105
- 3.7
107106
- 3.8
108107
- 3.9
109-
- "3.10.0-alpha - 3.10"
108+
- "3.10"
110109

111110
steps:
112111
- uses: actions/checkout@v2
@@ -151,12 +150,11 @@ jobs:
151150
matrix:
152151
os: [Windows]
153152
python:
154-
- 3.6
153+
- 3.7
155154
# Commented out, since Windows tests are expensively slow.
156-
# - 3.7
157155
# - 3.8
158156
- 3.9
159-
- "3.10.0-alpha - 3.10"
157+
- "3.10"
160158
group: [1, 2]
161159

162160
steps:

‎docs/html/development/ci.rst

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ Supported interpreters
1818

1919
pip support a variety of Python interpreters:
2020

21-
- CPython 3.6
2221
- CPython 3.7
2322
- CPython 3.8
2423
- CPython 3.9
24+
- CPython 3.10
2525
- Latest PyPy3
2626

2727
on different operating systems:
2828

2929
- Linux
3030
- Windows
31-
- MacOS
31+
- macOS
3232

3333
and on different architectures:
3434

@@ -77,9 +77,9 @@ Developer tasks
7777
======== =============== ================ ================== =============
7878
OS docs lint vendoring packaging
7979
======== =============== ================ ================== =============
80-
Linux Github Github Github Github
81-
Windows Github Github Github Github
82-
MacOS Github Github Github Github
80+
Linux GitHub GitHub GitHub GitHub
81+
Windows GitHub GitHub GitHub GitHub
82+
macOS GitHub GitHub GitHub GitHub
8383
======== =============== ================ ================== =============
8484

8585
Actual testing
@@ -88,28 +88,26 @@ Actual testing
8888
+------------------------------+---------------+-----------------+
8989
| **interpreter** | **unit** | **integration** |
9090
+-----------+----------+-------+---------------+-----------------+
91-
| | | CP3.6 | | |
92-
| | +-------+---------------+-----------------+
9391
| | x86 | CP3.7 | | |
9492
| | +-------+---------------+-----------------+
9593
| | | CP3.8 | | |
9694
| | +-------+---------------+-----------------+
9795
| | | CP3.9 | | |
9896
| | +-------+---------------+-----------------+
97+
| | | CP3.10| | |
98+
| | +-------+---------------+-----------------+
9999
| | | PyPy3 | | |
100100
| Windows +----------+-------+---------------+-----------------+
101-
| | | CP3.6 | Github | Github |
102-
| | +-------+---------------+-----------------+
103-
| | x64 | CP3.7 | | |
101+
| | x64 | CP3.7 | GitHub | GitHub |
104102
| | +-------+---------------+-----------------+
105103
| | | CP3.8 | | |
106104
| | +-------+---------------+-----------------+
107-
| | | CP3.9 | Github | Github |
105+
| | | CP3.9 | GitHub | GitHub |
106+
| | +-------+---------------+-----------------+
107+
| | | CP3.10| GitHub | GitHub |
108108
| | +-------+---------------+-----------------+
109109
| | | PyPy3 | | |
110110
+-----------+----------+-------+---------------+-----------------+
111-
| | | CP3.6 | | |
112-
| | +-------+---------------+-----------------+
113111
| | x86 | CP3.7 | | |
114112
| | +-------+---------------+-----------------+
115113
| | | CP3.8 | | |
@@ -118,33 +116,33 @@ Actual testing
118116
| | +-------+---------------+-----------------+
119117
| | | PyPy3 | | |
120118
| Linux +----------+-------+---------------+-----------------+
121-
| | | CP3.6 | Github | Github |
119+
| | x64 | CP3.7 | GitHub | GitHub |
122120
| | +-------+---------------+-----------------+
123-
| | x64 | CP3.7 | Github | Github |
121+
| | | CP3.8 | GitHub | GitHub |
124122
| | +-------+---------------+-----------------+
125-
| | | CP3.8 | Github | Github |
123+
| | | CP3.9 | GitHub | GitHub |
126124
| | +-------+---------------+-----------------+
127-
| | | CP3.9 | Github | Github |
125+
| | | CP3.10| GitHub | GitHub |
128126
| | +-------+---------------+-----------------+
129127
| | | PyPy3 | | |
130128
+-----------+----------+-------+---------------+-----------------+
131-
| | | CP3.6 | | |
132-
| | +-------+---------------+-----------------+
133129
| | x86 | CP3.7 | | |
134130
| | +-------+---------------+-----------------+
135131
| | | CP3.8 | | |
136132
| | +-------+---------------+-----------------+
137133
| | | CP3.9 | | |
138134
| | +-------+---------------+-----------------+
135+
| | | CP3.10| | |
136+
| | +-------+---------------+-----------------+
139137
| | | PyPy3 | | |
140-
| MacOS +----------+-------+---------------+-----------------+
141-
| | | CP3.6 | Github | Github |
138+
| macOS +----------+-------+---------------+-----------------+
139+
| | x64 | CP3.7 | GitHub | GitHub |
142140
| | +-------+---------------+-----------------+
143-
| | x64 | CP3.7 | Github | Github |
141+
| | | CP3.8 | GitHub | GitHub |
144142
| | +-------+---------------+-----------------+
145-
| | | CP3.8 | Github | Github |
143+
| | | CP3.9 | GitHub | GitHub |
146144
| | +-------+---------------+-----------------+
147-
| | | CP3.9 | Github | Github |
145+
| | | CP3.10| GitHub | GitHub |
148146
| | +-------+---------------+-----------------+
149147
| | | PyPy3 | | |
150148
+-----------+----------+-------+---------------+-----------------+

‎docs/html/development/getting-started.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ To run tests:
7070

7171
.. code-block:: console
7272
73-
$ tox -e py36 -- -n auto
73+
$ tox -e py310 -- -n auto
7474
7575
To run tests without parallelization, run:
7676

7777
.. code-block:: console
7878
79-
$ tox -e py36
79+
$ tox -e py310
8080
81-
The example above runs tests against Python 3.6. You can also use other
81+
The example above runs tests against Python 3.10. You can also use other
8282
versions like ``py39`` and ``pypy3``.
8383

8484
``tox`` has been configured to forward any additional arguments it is given to
@@ -88,11 +88,11 @@ can select tests using the various ways that pytest provides:
8888
.. code-block:: console
8989
9090
$ # Using file name
91-
$ tox -e py36 -- tests/functional/test_install.py
91+
$ tox -e py310 -- tests/functional/test_install.py
9292
$ # Using markers
93-
$ tox -e py36 -- -m unit
93+
$ tox -e py310 -- -m unit
9494
$ # Using keywords
95-
$ tox -e py36 -- -k "install and not wheel"
95+
$ tox -e py310 -- -k "install and not wheel"
9696
9797
Running pip's entire test suite requires supported version control tools
9898
(subversion, bazaar, git, and mercurial) to be installed. If you are missing
@@ -101,8 +101,8 @@ explicitly tell pytest to skip those tests:
101101

102102
.. code-block:: console
103103
104-
$ tox -e py36 -- -k "not svn"
105-
$ tox -e py36 -- -k "not (svn or git)"
104+
$ tox -e py310 -- -k "not svn"
105+
$ tox -e py310 -- -k "not (svn or git)"
106106
107107
108108
Running Linters

‎docs/html/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ pip install --upgrade pip
7575
The current version of pip works on:
7676

7777
- Windows, Linux and MacOS.
78-
- CPython 3.6, 3.7, 3.8, 3.9, 3.10 and latest PyPy3.
78+
- CPython 3.7, 3.8, 3.9, 3.10 and latest PyPy3.
7979

8080
pip is tested to work on the latest patch version of the Python interpreter,
8181
for each of the minor versions listed above. Previous patch versions are

‎news/10641.removal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drop support for Python 3.6.

‎noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def should_update_common_wheels() -> bool:
6969
# completely to nox for all our automation. Contributors should prefer using
7070
# `tox -e ...` until this note is removed.
7171
# -----------------------------------------------------------------------------
72-
@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"])
72+
@nox.session(python=["3.7", "3.8", "3.9", "3.10", "pypy3"])
7373
def test(session: nox.Session) -> None:
7474
# Get the common wheels.
7575
if should_update_common_wheels():

‎setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ exclude_lines =
107107
pragma: no cover
108108
# This excludes typing-specific code, which will be validated by mypy anyway.
109109
if TYPE_CHECKING
110-
# Can be set to exclude e.g. `if PY2:` on Python 3
111-
${PIP_CI_COVERAGE_EXCLUDES}
112110

113111
[metadata]
114112
license_file = LICENSE.txt

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ def get_version(rel_path: str) -> str:
3737
"Programming Language :: Python",
3838
"Programming Language :: Python :: 3",
3939
"Programming Language :: Python :: 3 :: Only",
40-
"Programming Language :: Python :: 3.6",
4140
"Programming Language :: Python :: 3.7",
4241
"Programming Language :: Python :: 3.8",
4342
"Programming Language :: Python :: 3.9",
@@ -81,5 +80,5 @@ def get_version(rel_path: str) -> str:
8180
],
8281
},
8382
zip_safe=False,
84-
python_requires=">=3.6",
83+
python_requires=">=3.7",
8584
)

‎src/pip/_internal/build_env.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,7 @@ def install_requirements(
197197
if not requirements:
198198
return
199199
with contextlib.ExitStack() as ctx:
200-
# TODO: Remove this block when dropping 3.6 support. Python 3.6
201-
# lacks importlib.resources and pep517 has issues loading files in
202-
# a zip, so we fallback to the "old" method by adding the current
203-
# pip directory to the child process's sys.path.
204-
if sys.version_info < (3, 7):
205-
pip_runnable = os.path.dirname(pip_location)
206-
else:
207-
pip_runnable = ctx.enter_context(_create_standalone_pip())
200+
pip_runnable = ctx.enter_context(_create_standalone_pip())
208201
self._install_requirements(
209202
pip_runnable,
210203
finder,

‎src/pip/_internal/commands/list.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from pip._internal.network.session import PipSession
1717
from pip._internal.utils.compat import stdlib_pkgs
1818
from pip._internal.utils.misc import tabulate, write_output
19-
from pip._internal.utils.parallel import map_multithread
2019

2120
if TYPE_CHECKING:
2221
from pip._internal.metadata.base import DistributionVersion
@@ -254,7 +253,7 @@ def latest_info(
254253
dist.latest_filetype = typ
255254
return dist
256255

257-
for dist in map_multithread(latest_info, packages):
256+
for dist in map(latest_info, packages):
258257
if dist is not None:
259258
yield dist
260259

‎src/pip/_internal/utils/parallel.py

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)