Skip to content

Commit 49c8196

Browse files
authored
Merge branch 'main' into diagnostic-error-on-pip-uninstall
2 parents faf02ac + 53ba3fb commit 49c8196

File tree

86 files changed

+436
-42
lines changed

Some content is hidden

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

86 files changed

+436
-42
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
# - "3.9"
179179
# - "3.10"
180180
# - "3.11"
181-
- "3.12" # Comment out when 3.13 is final
181+
# - "3.12"
182182
- "3.13"
183183
group: [1, 2]
184184

docs/html/development/ci.rst

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pip support a variety of Python interpreters:
2323
- CPython 3.10
2424
- CPython 3.11
2525
- CPython 3.12
26+
- CPython 3.13
2627
- Latest PyPy3
2728

2829
on different operating systems:
@@ -35,8 +36,9 @@ and on different architectures:
3536

3637
- x64
3738
- x86
39+
- arm64 (macOS only)
3840

39-
so 42 hypothetical interpreters.
41+
so 49 hypothetical interpreters.
4042

4143

4244
Checks
@@ -99,6 +101,8 @@ Actual testing
99101
| | +-------+---------------+-----------------+
100102
| | | CP3.12| | |
101103
| | +-------+---------------+-----------------+
104+
| | | CP3.13| | |
105+
| | +-------+---------------+-----------------+
102106
| | | PyPy3 | | |
103107
| Windows +----------+-------+---------------+-----------------+
104108
| | x64 | CP3.8 | GitHub | GitHub |
@@ -107,10 +111,12 @@ Actual testing
107111
| | +-------+---------------+-----------------+
108112
| | | CP3.10| | |
109113
| | +-------+---------------+-----------------+
110-
| | | CP3.11| GitHub | GitHub |
114+
| | | CP3.11| | |
111115
| | +-------+---------------+-----------------+
112116
| | | CP3.12| | |
113117
| | +-------+---------------+-----------------+
118+
| | | CP3.13| GitHub | GitHub |
119+
| | +-------+---------------+-----------------+
114120
| | | PyPy3 | | |
115121
+-----------+----------+-------+---------------+-----------------+
116122
| | x86 | CP3.8 | | |
@@ -123,6 +129,8 @@ Actual testing
123129
| | +-------+---------------+-----------------+
124130
| | | CP3.12| | |
125131
| | +-------+---------------+-----------------+
132+
| | | CP3.13| | |
133+
| | +-------+---------------+-----------------+
126134
| | | PyPy3 | | |
127135
| Linux +----------+-------+---------------+-----------------+
128136
| | x64 | CP3.8 | GitHub | GitHub |
@@ -135,17 +143,21 @@ Actual testing
135143
| | +-------+---------------+-----------------+
136144
| | | CP3.12| GitHub | GitHub |
137145
| | +-------+---------------+-----------------+
146+
| | | CP3.13| GitHub | GitHub |
147+
| | +-------+---------------+-----------------+
138148
| | | PyPy3 | | |
139149
+-----------+----------+-------+---------------+-----------------+
140-
| | arm64 | CP3.8 | | |
150+
| | arm64 | CP3.8 | GitHub | GitHub |
141151
| | +-------+---------------+-----------------+
142-
| | | CP3.9 | | |
152+
| | | CP3.9 | GitHub | GitHub |
143153
| | +-------+---------------+-----------------+
144-
| | | CP3.10| | |
154+
| | | CP3.10| GitHub | GitHub |
145155
| | +-------+---------------+-----------------+
146-
| | | CP3.11| | |
156+
| | | CP3.11| GitHub | GitHub |
147157
| | +-------+---------------+-----------------+
148-
| | | CP3.12| | |
158+
| | | CP3.12| GitHub | GitHub |
159+
| | +-------+---------------+-----------------+
160+
| | | CP3.13| GitHub | GitHub |
149161
| | +-------+---------------+-----------------+
150162
| | | PyPy3 | | |
151163
| macOS +----------+-------+---------------+-----------------+
@@ -159,5 +171,7 @@ Actual testing
159171
| | +-------+---------------+-----------------+
160172
| | | CP3.12| GitHub | GitHub |
161173
| | +-------+---------------+-----------------+
174+
| | | CP3.13| GitHub | GitHub |
175+
| | +-------+---------------+-----------------+
162176
| | | PyPy3 | | |
163177
+-----------+----------+-------+---------------+-----------------+

docs/html/installation.md

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

128128
- Windows, Linux and macOS.
129-
- CPython 3.8, 3.9, 3.10, 3.11, 3.12, and latest PyPy3.
129+
- CPython 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, and latest PyPy3.
130130

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

news/12678.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update classifier to support Python 3.13

news/12939.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update non PEP 440 wheel filename deprecation notice.

news/12961.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support for PEP 730 iOS wheels was added.

news/12974.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Create two new import groups, "vendored" and "import", this only affects tests.

news/13012.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Clean up non PEP 440 wheel filename deprecation language.

news/13013.trivial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove InvalidVersion exception catch for parse_{sdist,wheel}_filename.

news/truststore.vendor.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade truststore to 0.9.2

0 commit comments

Comments
 (0)