Skip to content

Commit 4a87ab0

Browse files
authored
Merge branch 'main' into feature/base-prefix-config
2 parents b777bcd + 9aa422d commit 4a87ab0

File tree

137 files changed

+2876
-1113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2876
-1113
lines changed

.github/no-response.yml

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

.github/workflows/ci.yml

Lines changed: 34 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v2
30-
- uses: actions/setup-python@v2
29+
- uses: actions/checkout@v3
30+
- uses: actions/setup-python@v4
31+
with:
32+
python-version: "3.x"
3133
- run: pip install nox
3234
- run: nox -s docs
3335

@@ -55,24 +57,15 @@ jobs:
5557
- "noxfile.py"
5658
if: github.event_name == 'pull_request'
5759

58-
pre-commit:
59-
name: pre-commit
60-
runs-on: ubuntu-latest
61-
62-
steps:
63-
- uses: actions/checkout@v2
64-
- uses: actions/setup-python@v2
65-
- uses: pre-commit/[email protected]
66-
with:
67-
extra_args: --all-files --hook-stage=manual
68-
6960
packaging:
7061
name: packaging
7162
runs-on: ubuntu-latest
7263

7364
steps:
74-
- uses: actions/checkout@v2
75-
- uses: actions/setup-python@v2
65+
- uses: actions/checkout@v3
66+
- uses: actions/setup-python@v4
67+
with:
68+
python-version: "3.x"
7669
- name: Set up git credentials
7770
run: |
7871
git config --global user.email "[email protected]"
@@ -81,6 +74,7 @@ jobs:
8174
- run: pip install nox
8275
- run: nox -s prepare-release -- 99.9
8376
- run: nox -s build-release -- 99.9
77+
- run: pipx run check-manifest
8478

8579
vendoring:
8680
name: vendoring
@@ -92,8 +86,10 @@ jobs:
9286
github.event_name != 'pull_request'
9387
9488
steps:
95-
- uses: actions/checkout@v2
96-
- uses: actions/setup-python@v2
89+
- uses: actions/checkout@v3
90+
- uses: actions/setup-python@v4
91+
with:
92+
python-version: "3.x"
9793

9894
- run: pip install nox
9995
- run: nox -s vendoring
@@ -103,7 +99,7 @@ jobs:
10399
name: tests / ${{ matrix.python }} / ${{ matrix.os }}
104100
runs-on: ${{ matrix.os }}-latest
105101

106-
needs: [pre-commit, packaging, determine-changes]
102+
needs: [packaging, determine-changes]
107103
if: >-
108104
needs.determine-changes.outputs.tests == 'true' ||
109105
github.event_name != 'pull_request'
@@ -113,14 +109,15 @@ jobs:
113109
matrix:
114110
os: [Ubuntu, MacOS]
115111
python:
116-
- 3.7
117-
- 3.8
118-
- 3.9
112+
- "3.7"
113+
- "3.8"
114+
- "3.9"
119115
- "3.10"
116+
- "3.11"
120117

121118
steps:
122-
- uses: actions/checkout@v2
123-
- uses: actions/setup-python@v2
119+
- uses: actions/checkout@v3
120+
- uses: actions/setup-python@v4
124121
with:
125122
python-version: ${{ matrix.python }}
126123

@@ -130,9 +127,9 @@ jobs:
130127

131128
- name: Install MacOS dependencies
132129
if: matrix.os == 'MacOS'
133-
run: brew install bzr
130+
run: brew install breezy
134131

135-
- run: pip install nox 'virtualenv<20' 'setuptools != 60.6.0'
132+
- run: pip install nox
136133

137134
# Main check
138135
- name: Run unit tests
@@ -151,7 +148,7 @@ jobs:
151148
name: tests / ${{ matrix.python }} / ${{ matrix.os }} / ${{ matrix.group }}
152149
runs-on: ${{ matrix.os }}-latest
153150

154-
needs: [pre-commit, packaging, determine-changes]
151+
needs: [packaging, determine-changes]
155152
if: >-
156153
needs.determine-changes.outputs.tests == 'true' ||
157154
github.event_name != 'pull_request'
@@ -161,16 +158,17 @@ jobs:
161158
matrix:
162159
os: [Windows]
163160
python:
164-
- 3.7
161+
- "3.7"
165162
# Commented out, since Windows tests are expensively slow.
166-
# - 3.8
167-
# - 3.9
168-
- "3.10"
163+
# - "3.8"
164+
# - "3.9"
165+
# - "3.10"
166+
- "3.11"
169167
group: [1, 2]
170168

171169
steps:
172-
- uses: actions/checkout@v2
173-
- uses: actions/setup-python@v2
170+
- uses: actions/checkout@v3
171+
- uses: actions/setup-python@v4
174172
with:
175173
python-version: ${{ matrix.python }}
176174

@@ -189,7 +187,7 @@ jobs:
189187
$acl.AddAccessRule($rule)
190188
Set-Acl "R:\Temp" $acl
191189
192-
- run: pip install nox 'virtualenv<20'
190+
- run: pip install nox
193191
env:
194192
TEMP: "R:\\Temp"
195193

@@ -225,14 +223,14 @@ jobs:
225223
name: tests / zipapp
226224
runs-on: ubuntu-latest
227225

228-
needs: [pre-commit, packaging, determine-changes]
226+
needs: [packaging, determine-changes]
229227
if: >-
230228
needs.determine-changes.outputs.tests == 'true' ||
231229
github.event_name != 'pull_request'
232230
233231
steps:
234-
- uses: actions/checkout@v2
235-
- uses: actions/setup-python@v2
232+
- uses: actions/checkout@v3
233+
- uses: actions/setup-python@v4
236234
with:
237235
python-version: "3.10"
238236

@@ -250,53 +248,16 @@ jobs:
250248
--durations=5
251249
--use-zipapp
252250
253-
# TODO: Remove this when we add Python 3.11 to CI.
254-
tests-importlib-metadata:
255-
name: tests for importlib.metadata backend
256-
runs-on: ubuntu-latest
257-
env:
258-
_PIP_USE_IMPORTLIB_METADATA: 'true'
259-
260-
needs: [pre-commit, packaging, determine-changes]
261-
if: >-
262-
needs.determine-changes.outputs.tests == 'true' ||
263-
github.event_name != 'pull_request'
264-
265-
steps:
266-
- uses: actions/checkout@v2
267-
- uses: actions/setup-python@v2
268-
with:
269-
python-version: '3.10'
270-
271-
- name: Install Ubuntu dependencies
272-
run: sudo apt-get install bzr
273-
274-
- run: pip install nox 'virtualenv<20'
275-
276-
- name: Run unit tests
277-
run: >-
278-
nox -s test-3.10 --
279-
-m unit
280-
--verbose --numprocesses auto --showlocals
281-
- name: Run integration tests
282-
run: >-
283-
nox -s test-3.10 --
284-
-m integration
285-
--verbose --numprocesses auto --showlocals
286-
--durations=5
287-
288251
check: # This job does nothing and is only used for the branch protection
289252
if: always()
290253

291254
needs:
292255
- determine-changes
293256
- docs
294257
- packaging
295-
- pre-commit
296258
- tests-unix
297259
- tests-windows
298260
- tests-zipapp
299-
- tests-importlib-metadata
300261
- vendoring
301262

302263
runs-on: ubuntu-latest

.github/workflows/news-file.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-20.04
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
# `towncrier check` runs `git diff --name-only origin/main...`, which
1616
# needs a non-shallow clone.

.github/workflows/no-response.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: No Response
2+
3+
# Both `issue_comment` and `scheduled` event types are required for this Action
4+
# to work properly.
5+
on:
6+
issue_comment:
7+
types: [created]
8+
schedule:
9+
# Schedule for five minutes after the hour, every hour
10+
- cron: '5 * * * *'
11+
12+
jobs:
13+
noResponse:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: lee-dohm/[email protected]
17+
with:
18+
token: ${{ github.token }}
19+
responseRequiredLabel: "S: awaiting response"

.pre-commit-config.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ repos:
7373
exclude: ^news/(.gitignore|.*\.(process|removal|feature|bugfix|vendor|doc|trivial).rst)
7474
files: ^news/
7575

76-
- repo: https://github.com/mgedmin/check-manifest
77-
rev: '0.48'
78-
hooks:
79-
- id: check-manifest
80-
stages: [manual]
76+
ci:
77+
autofix_prs: false
78+
autoupdate_commit_msg: 'pre-commit autoupdate'
79+
autoupdate_schedule: monthly

AUTHORS.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Christopher Hunt
137137
Christopher Snyder
138138
cjc7373
139139
Clark Boylan
140+
Claudio Jolowicz
140141
Clay McClure
141142
Cody
142143
Cody Soyland
@@ -234,6 +235,8 @@ Erik Rose
234235
Erwin Janssen
235236
Eugene Vereshchagin
236237
everdimension
238+
Federico
239+
Felipe Peter
237240
Felix Yan
238241
fiber-space
239242
Filip Kokosiński
@@ -275,6 +278,7 @@ Hari Charan
275278
Harsh Vardhan
276279
harupy
277280
Harutaka Kawamura
281+
hauntsaninja
278282
Henrich Hartzer
279283
Henry Schreiner
280284
Herbert Pfennig
@@ -299,6 +303,7 @@ Ionel Maries Cristian
299303
Ivan Pozdeev
300304
Jacob Kim
301305
Jacob Walls
306+
Jaime Sanz
302307
jakirkham
303308
Jakub Stasiak
304309
Jakub Vysoky
@@ -393,6 +398,7 @@ Luo Jiebin
393398
luojiebin
394399
luz.paz
395400
László Kiss Kollár
401+
M00nL1ght
396402
Marc Abramowitz
397403
Marc Tamlyn
398404
Marcus Smith
@@ -545,6 +551,7 @@ Reece Dunham
545551
Remi Rampin
546552
Rene Dudfield
547553
Riccardo Magliocchetti
554+
Riccardo Schirone
548555
Richard Jones
549556
Richard Si
550557
Ricky Ng-Adam

NEWS.rst

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,73 @@
99
1010
.. towncrier release notes start
1111
12+
22.3.1 (2022-11-05)
13+
===================
14+
15+
Bug Fixes
16+
---------
17+
18+
- Fix entry point generation of ``pip.X``, ``pipX.Y``, and ``easy_install-X.Y``
19+
to correctly account for multi-digit Python version segments (e.g. the "11"
20+
part of 3.11). (`#11547 <https://github.com/pypa/pip/issues/11547>`_)
21+
22+
23+
22.3 (2022-10-15)
24+
=================
25+
26+
Deprecations and Removals
27+
-------------------------
28+
29+
- Deprecate ``--install-options`` which forces pip to use the deprecated ``install``
30+
command of ``setuptools``. (`#11358 <https://github.com/pypa/pip/issues/11358>`_)
31+
- Deprecate installation with 'setup.py install' when no-binary is enabled for
32+
source distributions without 'pyproject.toml'. (`#11452 <https://github.com/pypa/pip/issues/11452>`_)
33+
- Deprecate ```--no-binary`` disabling the wheel cache. (`#11454 <https://github.com/pypa/pip/issues/11454>`_)
34+
- Remove ``--use-feature=2020-resolver`` opt-in flag. This was supposed to be removed in 21.0, but missed during that release cycle. (`#11493 <https://github.com/pypa/pip/issues/11493>`_)
35+
- Deprecate installation with 'setup.py install' when the 'wheel' package is absent for
36+
source distributions without 'pyproject.toml'. (`#8559 <https://github.com/pypa/pip/issues/8559>`_)
37+
- Remove the ability to use ``pip list --outdated`` in combination with ``--format=freeze``. (`#9789 <https://github.com/pypa/pip/issues/9789>`_)
38+
39+
Features
40+
--------
41+
42+
- Use ``shell=True`` for opening the editor with ``pip config edit``. (`#10716 <https://github.com/pypa/pip/issues/10716>`_)
43+
- Use the ``data-dist-info-metadata`` attribute from :pep:`658` to resolve distribution metadata without downloading the dist yet. (`#11111 <https://github.com/pypa/pip/issues/11111>`_)
44+
- Add an option to run the test suite with pip built as a zipapp. (`#11250 <https://github.com/pypa/pip/issues/11250>`_)
45+
- Add a ``--python`` option to allow pip to manage Python environments other
46+
than the one pip is installed in. (`#11320 <https://github.com/pypa/pip/issues/11320>`_)
47+
- Document the new (experimental) zipapp distribution of pip. (`#11459 <https://github.com/pypa/pip/issues/11459>`_)
48+
- Use the much faster 'bzr co --lightweight' to obtain a copy of a Bazaar tree. (`#5444 <https://github.com/pypa/pip/issues/5444>`_)
49+
50+
Bug Fixes
51+
---------
52+
53+
- Fix ``--no-index`` when ``--index-url`` or ``--extra-index-url`` is specified
54+
inside a requirements file. (`#11276 <https://github.com/pypa/pip/issues/11276>`_)
55+
- Ensure that the candidate ``pip`` executable exists, when checking for a new version of pip. (`#11309 <https://github.com/pypa/pip/issues/11309>`_)
56+
- Ignore distributions with invalid ``Name`` in metadata instead of crashing, when
57+
using the ``importlib.metadata`` backend. (`#11352 <https://github.com/pypa/pip/issues/11352>`_)
58+
- Raise RequirementsFileParseError when parsing malformed requirements options that can't be sucessfully parsed by shlex. (`#11491 <https://github.com/pypa/pip/issues/11491>`_)
59+
- Fix build environment isolation on some system Pythons. (`#6264 <https://github.com/pypa/pip/issues/6264>`_)
60+
61+
Vendored Libraries
62+
------------------
63+
64+
- Upgrade certifi to 2022.9.24
65+
- Upgrade distlib to 0.3.6
66+
- Upgrade idna to 3.4
67+
- Upgrade pep517 to 0.13.0
68+
- Upgrade pygments to 2.13.0
69+
- Upgrade tenacity to 8.1.0
70+
- Upgrade typing_extensions to 4.4.0
71+
- Upgrade urllib3 to 1.26.12
72+
73+
Improved Documentation
74+
----------------------
75+
76+
- Mention that --quiet must be used when writing the installation report to stdout. (`#11357 <https://github.com/pypa/pip/issues/11357>`_)
77+
78+
1279
22.2.2 (2022-08-03)
1380
===================
1481

0 commit comments

Comments
 (0)