Skip to content

Commit a844f3b

Browse files
authored
Merge branch 'main' into feature/no-download-for-dry-run
2 parents 196f992 + 81b3c05 commit a844f3b

File tree

120 files changed

+1103
-5143
lines changed

Some content is hidden

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

120 files changed

+1103
-5143
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
runs-on: ubuntu-22.04
2929

3030
steps:
31-
- uses: actions/checkout@v4
32-
- uses: actions/setup-python@v5
31+
- uses: actions/checkout@v5
32+
- uses: actions/setup-python@v6
3333
with:
3434
python-version: "3.x"
3535
- run: pip install nox
@@ -70,8 +70,8 @@ jobs:
7070
os: [ubuntu-22.04, windows-latest]
7171

7272
steps:
73-
- uses: actions/checkout@v4
74-
- uses: actions/setup-python@v5
73+
- uses: actions/checkout@v5
74+
- uses: actions/setup-python@v6
7575
with:
7676
python-version: "3.x"
7777
- name: Set up git credentials
@@ -82,7 +82,7 @@ jobs:
8282
- run: pip install nox
8383
- run: nox -s prepare-release -- 99.9
8484
- run: nox -s build-release -- 99.9
85-
- run: pipx run check-manifest
85+
- run: pipx run check-sdist
8686

8787
vendoring:
8888
name: vendoring
@@ -94,8 +94,8 @@ jobs:
9494
github.event_name != 'pull_request'
9595
9696
steps:
97-
- uses: actions/checkout@v4
98-
- uses: actions/setup-python@v5
97+
- uses: actions/checkout@v5
98+
- uses: actions/setup-python@v6
9999
with:
100100
python-version: "3.x"
101101

@@ -115,17 +115,18 @@ jobs:
115115
strategy:
116116
fail-fast: true
117117
matrix:
118-
os: [ubuntu-22.04, macos-13, macos-latest]
118+
os: [ubuntu-22.04, macos-latest]
119119
python:
120120
- "3.9"
121121
- "3.10"
122122
- "3.11"
123123
- "3.12"
124124
- "3.13"
125+
- "3.14"
125126

126127
steps:
127-
- uses: actions/checkout@v4
128-
- uses: actions/setup-python@v5
128+
- uses: actions/checkout@v5
129+
- uses: actions/setup-python@v6
129130
with:
130131
python-version: ${{ matrix.python }}
131132
allow-prereleases: true
@@ -181,6 +182,7 @@ jobs:
181182
# - "3.11"
182183
# - "3.12"
183184
- "3.13"
185+
- "3.14"
184186
group:
185187
- { number: 1, pytest-filter: "not test_install" }
186188
- { number: 2, pytest-filter: "test_install" }
@@ -193,8 +195,8 @@ jobs:
193195
mkdir "D:\\Temp"
194196
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
195197
196-
- uses: actions/checkout@v4
197-
- uses: actions/setup-python@v5
198+
- uses: actions/checkout@v5
199+
- uses: actions/setup-python@v6
198200
with:
199201
python-version: ${{ matrix.python }}
200202
allow-prereleases: true
@@ -228,8 +230,8 @@ jobs:
228230
github.event_name != 'pull_request'
229231
230232
steps:
231-
- uses: actions/checkout@v4
232-
- uses: actions/setup-python@v5
233+
- uses: actions/checkout@v5
234+
- uses: actions/setup-python@v6
233235
with:
234236
python-version: "3.10"
235237

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
14+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1515
with:
1616
persist-credentials: false
1717
- name: Build a binary wheel and a source tarball
@@ -36,9 +36,9 @@ jobs:
3636

3737
steps:
3838
- name: Download all the dists
39-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
39+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
4040
with:
4141
name: python-package-distributions
4242
path: dist/
4343
- name: Publish distribution 📦 to PyPI
44-
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # release/v1
44+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1

.github/workflows/update-rtd-redirects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
runs-on: ubuntu-latest
2222
environment: RTD Deploys
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-python@v5
24+
- uses: actions/checkout@v5
25+
- uses: actions/setup-python@v6
2626
with:
2727
python-version: "3.11"
2828
- run: pipx run tools/update-rtd-redirects.py

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ exclude: 'src/pip/_vendor/'
22

33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v5.0.0
5+
rev: v6.0.0
66
hooks:
77
- id: check-builtin-literals
88
- id: check-added-large-files
@@ -22,13 +22,13 @@ repos:
2222
- id: black
2323

2424
- repo: https://github.com/astral-sh/ruff-pre-commit
25-
rev: v0.12.2
25+
rev: v0.12.11
2626
hooks:
2727
- id: ruff-check
2828
args: [--fix]
2929

3030
- repo: https://github.com/pre-commit/mirrors-mypy
31-
rev: v1.16.1
31+
rev: v1.17.1
3232
hooks:
3333
- id: mypy
3434
exclude: tests/data
@@ -41,6 +41,7 @@ repos:
4141
'types-setuptools==68.2.0.0',
4242
'types-freezegun==1.1.10',
4343
'types-pyyaml==6.0.12.12',
44+
'typing-extensions',
4445
]
4546

4647
- repo: https://github.com/pre-commit/pygrep-hooks

.readthedocs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ build:
44
os: ubuntu-22.04
55
tools:
66
python: "3.11"
7+
jobs:
8+
install:
9+
- pip install .
10+
- pip install --group docs
711

812
sphinx:
913
builder: dirhtml
1014
configuration: docs/html/conf.py
11-
12-
python:
13-
install:
14-
- requirements: docs/requirements.txt

AUTHORS.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,13 @@ Davidovich
220220
ddelange
221221
Deepak Sharma
222222
Deepyaman Datta
223+
Denis Roussel (ACSONE)
223224
Denise Yu
224225
dependabot[bot]
225226
derwolfe
226227
Desetude
227228
developer
229+
Devesh Kumar
228230
Devesh Kumar Singh
229231
devsagul
230232
Diego Caraballo
@@ -295,6 +297,7 @@ Gabriel de Perthuis
295297
Garry Polley
296298
gavin
297299
gdanielson
300+
Gene Wood
298301
Geoffrey Sneddon
299302
George Margaritis
300303
George Song
@@ -333,6 +336,7 @@ Hugo Lopes Tavares
333336
Hugo van Kemenade
334337
Hugues Bruant
335338
Hynek Schlawack
339+
iamsrp-deshaw
336340
Ian Bicking
337341
Ian Cordasco
338342
Ian Lee
@@ -640,6 +644,7 @@ Pulkit Goyal
640644
q0w
641645
Qiangning Hong
642646
Qiming Xu
647+
qraqras
643648
Quentin Lee
644649
Quentin Pradet
645650
R. David Murray
@@ -665,6 +670,7 @@ Robert McGibbon
665670
Robert Pollak
666671
Robert T. McGibbon
667672
robin elisha robinson
673+
Rodney, Tiara
668674
Roey Berman
669675
Rohan Jain
670676
Roman Bogorodskiy
@@ -680,6 +686,7 @@ Russell Keith-Magee
680686
Ryan Shepherd
681687
Ryan Wooden
682688
ryneeverett
689+
Ryuma Asai
683690
S. Guliaev
684691
Sachi King
685692
Salvatore Rinchiera
@@ -694,6 +701,8 @@ Sebastian Jordan
694701
Sebastian Schaetz
695702
Segev Finer
696703
SeongSoo Cho
704+
Sepehr Rasouli
705+
sepehrrasooli
697706
Sergey Vasilyev
698707
Seth Michael Larson
699708
Seth Woodworth
@@ -719,6 +728,7 @@ Stavros Korokithakis
719728
Stefan Scherfke
720729
Stefano Rivera
721730
Stephan Erb
731+
Stephen Payne
722732
Stephen Rosen
723733
stepshal
724734
Steve (Gadget) Barnes
@@ -811,7 +821,9 @@ Yeray Diaz Diaz
811821
Yoval P
812822
Yu Jian
813823
Yuan Jing Vincent Yan
824+
Yuki Kobayashi
814825
Yusuke Hayashi
826+
zackzack38
815827
Zearin
816828
Zhiping Deng
817829
ziebam

MANIFEST.in

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

NEWS.rst

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,66 @@
99
1010
.. towncrier release notes start
1111
12+
25.2 (2025-07-30)
13+
=================
14+
15+
Features
16+
--------
17+
18+
- Declare support for Python 3.14 (`#13506 <https://github.com/pypa/pip/issues/13506>`_)
19+
- Automatic download resumption and retrying is enabled by default. (`#13464 <https://github.com/pypa/pip/issues/13464>`_)
20+
- Requires-Python error message displays version clauses in numerical order. (`#13367 <https://github.com/pypa/pip/issues/13367>`_)
21+
- Minor performance improvement getting the order to install a very large number of interdependent packages. (`#13424 <https://github.com/pypa/pip/issues/13424>`_)
22+
- Show time taken instead of ``eta 0:00:00`` at download completion. (`#13483 <https://github.com/pypa/pip/issues/13483>`_)
23+
- Speed up small CLI tools by removing ``import re`` from the console
24+
script executable template. (`#13165 <https://github.com/pypa/pip/issues/13165>`_)
25+
- Remove warning when cloning from a Git reference that does not look like a commit hash. (`#12283 <https://github.com/pypa/pip/issues/12283>`_)
26+
27+
Bug Fixes
28+
---------
29+
30+
- ``pip config debug`` now correctly separates options as set by the different files
31+
at the same level. (`#12099 <https://github.com/pypa/pip/issues/12099>`_)
32+
- Ensure truststore feature remains active even when a proxy is also in use. (`#13343 <https://github.com/pypa/pip/issues/13343>`_)
33+
- Include sub-commands in tab completion. (`#13140 <https://github.com/pypa/pip/issues/13140>`_)
34+
- ``pip list`` with the ``json`` or ``freeze`` format enabled will no longer
35+
crash when encountering a package with an invalid version. (`#13345 <https://github.com/pypa/pip/issues/13345>`_)
36+
- Provide a hint if a system error is raised involving long filenames or path segments on Windows. (`#13346 <https://github.com/pypa/pip/issues/13346>`_)
37+
- Resumed downloads are saved to the HTTP cache like any other normal download. (`#13441 <https://github.com/pypa/pip/issues/13441>`_)
38+
- Configured verbosity is consistently forwarded while calling Git during
39+
VCS operations. (`#13329 <https://github.com/pypa/pip/issues/13329>`_)
40+
- Suppress the progress bar, when running with ``--log`` and ``--quiet``.
41+
42+
Consequently, a new ``auto`` mode for ``--progress-bar`` has been added.
43+
``auto`` will enable progress bars unless suppressed by ``--quiet``,
44+
while ``on`` will always enable progress bars. (`#10915 <https://github.com/pypa/pip/issues/10915>`_)
45+
- Fix normalization of local URLs with non-``file`` schemes. (`#13509 <https://github.com/pypa/pip/issues/13509>`_)
46+
- Fix normalization of local file URLs on Windows in newer Python versions. (`#13510 <https://github.com/pypa/pip/issues/13510>`_)
47+
- Fix remaining test failures in Python 3.14 by adjusting ``path_to_url`` and similar functions. (`#13423 <https://github.com/pypa/pip/issues/13423>`_)
48+
- Fix missing ``network`` test markings, making the suite pass in offline
49+
environments again. (`#13378 <https://github.com/pypa/pip/issues/13378>`_)
50+
51+
Vendored Libraries
52+
------------------
53+
54+
- Upgrade CacheControl to 0.14.3
55+
- Upgrade certifi to 2025.7.14
56+
- Upgrade distlib to 0.4.0
57+
- Upgrade msgpack to 1.1.1
58+
- Upgrade platformdirs to 4.3.8
59+
- Upgrade pygments to 2.19.2
60+
- Upgrade requests to 2.32.4
61+
- Upgrade resolvelib to 1.2.0
62+
- Upgrade rich to 14.1.0
63+
- Remove vendored typing-extensions.
64+
65+
Process
66+
-------
67+
68+
- pip's own licensing metadata now follows :pep:`639`.
69+
In addition, the licenses of pip's vendored dependencies are now included
70+
in the ``License-File`` metadata field and in the wheel.
71+
1272
25.1.1 (2025-05-02)
1373
===================
1474

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
build
2-
setuptools
2+
flit-core

build-project/build-requirements.txt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
#
55
# pip-compile --allow-unsafe --generate-hashes build-requirements.in
66
#
7-
build==1.2.2.post1 \
8-
--hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 \
9-
--hash=sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7
7+
build==1.3.0 \
8+
--hash=sha256:698edd0ea270bde950f53aed21f3a0135672206f3911e0176261a31e0e07b397 \
9+
--hash=sha256:7145f0b5061ba90a1500d60bd1b13ca0a8a4cebdd0cc16ed8adf1c0e739f43b4
1010
# via -r build-requirements.in
11-
packaging==24.2 \
12-
--hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
13-
--hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
11+
flit-core==3.12.0 \
12+
--hash=sha256:18f63100d6f94385c6ed57a72073443e1a71a4acb4339491615d0f16d6ff01b2 \
13+
--hash=sha256:e7a0304069ea895172e3c7bb703292e992c5d1555dd1233ab7b5621b5b69e62c
14+
# via -r build-requirements.in
15+
packaging==25.0 \
16+
--hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \
17+
--hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
1418
# via build
1519
pyproject-hooks==1.2.0 \
1620
--hash=sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8 \
1721
--hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913
1822
# via build
19-
20-
# The following packages are considered to be unsafe in a requirements file:
21-
setuptools==80.9.0 \
22-
--hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
23-
--hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
24-
# via -r build-requirements.in

0 commit comments

Comments
 (0)