Skip to content

Commit 74e283c

Browse files
authored
Merge branch 'pypa:main' into parallel-downloads
2 parents e754fd6 + ae5fff3 commit 74e283c

File tree

194 files changed

+1979
-1499
lines changed

Some content is hidden

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

194 files changed

+1979
-1499
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
schedule:
1212
- cron: 0 0 * * MON # Run every Monday at 00:00 UTC
1313

14+
env:
15+
# The "FORCE_COLOR" variable, when set to 1,
16+
# tells Nox to colorize itself.
17+
FORCE_COLOR: "1"
18+
1419
concurrency:
1520
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
1621
cancel-in-progress: true
@@ -22,7 +27,7 @@ jobs:
2227

2328
steps:
2429
- uses: actions/checkout@v4
25-
- uses: actions/setup-python@v4
30+
- uses: actions/setup-python@v5
2631
with:
2732
python-version: "3.x"
2833
- run: pip install nox
@@ -58,7 +63,7 @@ jobs:
5863

5964
steps:
6065
- uses: actions/checkout@v4
61-
- uses: actions/setup-python@v4
66+
- uses: actions/setup-python@v5
6267
with:
6368
python-version: "3.x"
6469
- name: Set up git credentials
@@ -82,7 +87,7 @@ jobs:
8287
8388
steps:
8489
- uses: actions/checkout@v4
85-
- uses: actions/setup-python@v4
90+
- uses: actions/setup-python@v5
8691
with:
8792
python-version: "3.x"
8893

@@ -104,7 +109,6 @@ jobs:
104109
matrix:
105110
os: [Ubuntu, MacOS]
106111
python:
107-
- "3.7"
108112
- "3.8"
109113
- "3.9"
110114
- "3.10"
@@ -113,7 +117,7 @@ jobs:
113117

114118
steps:
115119
- uses: actions/checkout@v4
116-
- uses: actions/setup-python@v4
120+
- uses: actions/setup-python@v5
117121
with:
118122
python-version: ${{ matrix.python }}
119123
allow-prereleases: true
@@ -155,17 +159,16 @@ jobs:
155159
matrix:
156160
os: [Windows]
157161
python:
158-
- "3.7"
162+
- "3.8"
159163
# Commented out, since Windows tests are expensively slow.
160-
# - "3.8"
161164
# - "3.9"
162165
# - "3.10"
163166
- "3.11"
164167
group: [1, 2]
165168

166169
steps:
167170
- uses: actions/checkout@v4
168-
- uses: actions/setup-python@v4
171+
- uses: actions/setup-python@v5
169172
with:
170173
python-version: ${{ matrix.python }}
171174

@@ -216,7 +219,7 @@ jobs:
216219
217220
steps:
218221
- uses: actions/checkout@v4
219-
- uses: actions/setup-python@v4
222+
- uses: actions/setup-python@v5
220223
with:
221224
python-version: "3.10"
222225

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
environment: RTD Deploys
2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: actions/setup-python@v4
22+
- uses: actions/setup-python@v5
2323
with:
2424
python-version: "3.11"
2525
- run: pip install httpx pyyaml rich

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Hugo van Kemenade <[email protected]> hugovk <[email protected]
2727
2828
Ilya Baryshev <[email protected]>
2929
Jakub Stasiak <[email protected]>
30+
Jean Abou Samra <[email protected]>
3031
John-Scott Atlakson <[email protected]>
3132
Jorge Niedbalski <[email protected]>
3233

.pre-commit-config.yaml

Lines changed: 13 additions & 12 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: v4.4.0
5+
rev: v4.5.0
66
hooks:
77
- id: check-builtin-literals
88
- id: check-added-large-files
@@ -16,31 +16,32 @@ repos:
1616
- id: trailing-whitespace
1717
exclude: .patch
1818

19-
- repo: https://github.com/psf/black
20-
rev: 23.7.0
19+
- repo: https://github.com/psf/black-pre-commit-mirror
20+
rev: 23.12.1
2121
hooks:
2222
- id: black
2323

2424
- repo: https://github.com/astral-sh/ruff-pre-commit
25-
rev: v0.0.292
25+
rev: v0.2.0
2626
hooks:
2727
- id: ruff
28+
args: [--fix, --exit-non-zero-on-fix]
2829

2930
- repo: https://github.com/pre-commit/mirrors-mypy
30-
rev: v0.961
31+
rev: v1.8.0
3132
hooks:
3233
- id: mypy
3334
exclude: tests/data
3435
args: ["--pretty", "--show-error-codes"]
3536
additional_dependencies: [
36-
'keyring==23.0.1',
37-
'nox==2021.6.12',
37+
'keyring==24.2.0',
38+
'nox==2023.4.22',
3839
'pytest',
39-
'types-docutils==0.18.3',
40-
'types-setuptools==57.4.14',
41-
'types-freezegun==1.1.9',
42-
'types-six==1.16.15',
43-
'types-pyyaml==6.0.12.2',
40+
'types-docutils==0.20.0.3',
41+
'types-setuptools==68.2.0.0',
42+
'types-freezegun==1.1.10',
43+
'types-six==1.16.21.9',
44+
'types-pyyaml==6.0.12.12',
4445
]
4546

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

AUTHORS.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Albert-Guan
2020
albertg
2121
Alberto Sottile
2222
Aleks Bunin
23+
Ales Erjavec
2324
Alethea Flowers
2425
Alex Gaynor
2526
Alex Grönholm
@@ -30,6 +31,7 @@ Alex Stachowiak
3031
Alexander Shtyrov
3132
Alexandre Conrad
3233
Alexey Popravka
34+
Aleš Erjavec
3335
Alli
3436
Ami Fischman
3537
Ananya Maiti
@@ -158,6 +160,7 @@ Cristina Muñoz
158160
Curtis Doty
159161
cytolentino
160162
Daan De Meyer
163+
Dale
161164
Damian
162165
Damian Quiroga
163166
Damian Shaw
@@ -196,9 +199,11 @@ David Runge
196199
David Tucker
197200
David Wales
198201
Davidovich
202+
ddelange
199203
Deepak Sharma
200204
Deepyaman Datta
201205
Denise Yu
206+
dependabot[bot]
202207
derwolfe
203208
Desetude
204209
Devesh Kumar Singh
@@ -222,7 +227,10 @@ Dustin Ingram
222227
Dwayne Bailey
223228
Ed Morley
224229
Edgar Ramírez
230+
Edgar Ramírez Mondragón
225231
Ee Durbin
232+
Efflam Lemaillet
233+
efflamlemaillet
226234
Eitan Adler
227235
ekristina
228236
elainechan
@@ -252,6 +260,7 @@ Filip Kokosiński
252260
Filipe Laíns
253261
Finn Womack
254262
finnagin
263+
Flavio Amurrio
255264
Florian Briand
256265
Florian Rathgeber
257266
Francesco
@@ -312,7 +321,9 @@ Ilya Baryshev
312321
Inada Naoki
313322
Ionel Cristian Mărieș
314323
Ionel Maries Cristian
324+
Itamar Turner-Trauring
315325
Ivan Pozdeev
326+
J. Nick Koston
316327
Jacob Kim
317328
Jacob Walls
318329
Jaime Sanz
@@ -335,9 +346,11 @@ Jason R. Coombs
335346
JasonMo
336347
JasonMo1
337348
Jay Graves
349+
Jean Abou Samra
338350
Jean-Christophe Fillion-Robin
339351
Jeff Barber
340352
Jeff Dairiki
353+
Jeff Widman
341354
Jelmer Vernooij
342355
jenix21
343356
Jeremy Stanley
@@ -367,6 +380,7 @@ Joseph Long
367380
Josh Bronson
368381
Josh Hansen
369382
Josh Schneier
383+
Joshua
370384
Juan Luis Cano Rodríguez
371385
Juanjo Bazán
372386
Judah Rand
@@ -397,6 +411,7 @@ KOLANICH
397411
kpinc
398412
Krishna Oza
399413
Kumar McMillan
414+
Kurt McKee
400415
Kyle Persohn
401416
lakshmanaram
402417
Laszlo Kiss-Kollar
@@ -413,6 +428,7 @@ lorddavidiii
413428
Loren Carvalho
414429
Lucas Cimon
415430
Ludovic Gasc
431+
Lukas Geiger
416432
Lukas Juhrich
417433
Luke Macken
418434
Luo Jiebin
@@ -529,6 +545,7 @@ Patrick Jenkins
529545
Patrick Lawson
530546
patricktokeeffe
531547
Patrik Kopkan
548+
Paul Ganssle
532549
Paul Kehrer
533550
Paul Moore
534551
Paul Nasrat
@@ -569,6 +586,7 @@ Przemek Wrzos
569586
Pulkit Goyal
570587
q0w
571588
Qiangning Hong
589+
Qiming Xu
572590
Quentin Lee
573591
Quentin Pradet
574592
R. David Murray
@@ -609,6 +627,7 @@ ryneeverett
609627
Sachi King
610628
Salvatore Rinchiera
611629
sandeepkiran-js
630+
Sander Van Balen
612631
Savio Jomton
613632
schlamar
614633
Scott Kitterman
@@ -621,6 +640,7 @@ SeongSoo Cho
621640
Sergey Vasilyev
622641
Seth Michael Larson
623642
Seth Woodworth
643+
Shahar Epstein
624644
Shantanu
625645
shireenrao
626646
Shivansh-007
@@ -648,6 +668,7 @@ Steve Kowalik
648668
Steven Myint
649669
Steven Silvester
650670
stonebig
671+
studioj
651672
Stéphane Bidoul
652673
Stéphane Bidoul (ACSONE)
653674
Stéphane Klein
@@ -704,6 +725,7 @@ Vincent Philippon
704725
Vinicyus Macedo
705726
Vipul Kumar
706727
Vitaly Babiy
728+
Vladimir Fokow
707729
Vladimir Rutsky
708730
W. Trevor King
709731
Wil Tan

0 commit comments

Comments
 (0)