Skip to content

Commit 4e84130

Browse files
corona10corona10
committed
Merge remote-tracking branch 'upstream/main' into pythongh-111968 
2 parents af86a20 + d99d871 commit 4e84130

139 files changed

Lines changed: 3723 additions & 3067 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
if: needs.check_source.outputs.run_tests == 'true'
129129
steps:
130130
- uses: actions/checkout@v4
131-
- uses: actions/setup-python@v4
131+
- uses: actions/setup-python@v5
132132
with:
133133
python-version: '3.x'
134134
- name: Restore config.cache
@@ -187,13 +187,13 @@ jobs:
187187
if: needs.check_source.outputs.run_tests == 'true'
188188
uses: ./.github/workflows/reusable-windows.yml
189189

190-
build_windows_free_threaded:
191-
name: 'Windows (free-threaded)'
190+
build_windows_free_threading:
191+
name: 'Windows (free-threading)'
192192
needs: check_source
193193
if: needs.check_source.outputs.run_tests == 'true'
194194
uses: ./.github/workflows/reusable-windows.yml
195195
with:
196-
free-threaded: true
196+
free-threading: true
197197

198198
build_macos:
199199
name: 'macOS'
@@ -203,14 +203,14 @@ jobs:
203203
with:
204204
config_hash: ${{ needs.check_source.outputs.config_hash }}
205205

206-
build_macos_free_threaded:
207-
name: 'macOS (free-threaded)'
206+
build_macos_free_threading:
207+
name: 'macOS (free-threading)'
208208
needs: check_source
209209
if: needs.check_source.outputs.run_tests == 'true'
210210
uses: ./.github/workflows/reusable-macos.yml
211211
with:
212212
config_hash: ${{ needs.check_source.outputs.config_hash }}
213-
free-threaded: true
213+
free-threading: true
214214

215215
build_ubuntu:
216216
name: 'Ubuntu'
@@ -225,8 +225,8 @@ jobs:
225225
--with-pydebug \
226226
--with-openssl=$OPENSSL_DIR
227227
228-
build_ubuntu_free_threaded:
229-
name: 'Ubuntu (free-threaded)'
228+
build_ubuntu_free_threading:
229+
name: 'Ubuntu (free-threading)'
230230
needs: check_source
231231
if: needs.check_source.outputs.run_tests == 'true'
232232
uses: ./.github/workflows/reusable-ubuntu.yml
@@ -395,7 +395,7 @@ jobs:
395395
-x test_subprocess \
396396
-x test_signal \
397397
-x test_sysconfig
398-
- uses: actions/upload-artifact@v3
398+
- uses: actions/upload-artifact@v4
399399
if: always()
400400
with:
401401
name: hypothesis-example-db
@@ -483,14 +483,14 @@ jobs:
483483
output-sarif: true
484484
sanitizer: ${{ matrix.sanitizer }}
485485
- name: Upload crash
486-
uses: actions/upload-artifact@v3
486+
uses: actions/upload-artifact@v4
487487
if: failure() && steps.build.outcome == 'success'
488488
with:
489489
name: ${{ matrix.sanitizer }}-artifacts
490490
path: ./out/artifacts
491491
- name: Upload SARIF
492492
if: always() && steps.build.outcome == 'success'
493-
uses: github/codeql-action/upload-sarif@v2
493+
uses: github/codeql-action/upload-sarif@v3
494494
with:
495495
sarif_file: cifuzz-sarif/results.sarif
496496
checkout_path: cifuzz-sarif
@@ -504,12 +504,12 @@ jobs:
504504
- check-docs
505505
- check_generated_files
506506
- build_macos
507-
- build_macos_free_threaded
507+
- build_macos_free_threading
508508
- build_ubuntu
509-
- build_ubuntu_free_threaded
509+
- build_ubuntu_free_threading
510510
- build_ubuntu_ssltests
511511
- build_windows
512-
- build_windows_free_threaded
512+
- build_windows_free_threading
513513
- test_hypothesis
514514
- build_asan
515515
- cifuzz
@@ -537,12 +537,12 @@ jobs:
537537
&& '
538538
check_generated_files,
539539
build_macos,
540-
build_macos_free_threaded,
540+
build_macos_free_threading,
541541
build_ubuntu,
542-
build_ubuntu_free_threaded,
542+
build_ubuntu_free_threading,
543543
build_ubuntu_ssltests,
544544
build_windows,
545-
build_windows_free_threaded,
545+
build_windows_free_threading,
546546
build_asan,
547547
'
548548
|| ''

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@v4
23-
- uses: actions/setup-python@v4
23+
- uses: actions/setup-python@v5
2424
with:
2525
python-version: "3.x"
2626
- uses: pre-commit/action@v3.0.0

‎.github/workflows/mypy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
timeout-minutes: 10
4747
steps:
4848
- uses: actions/checkout@v4
49-
- uses: actions/setup-python@v4
49+
- uses: actions/setup-python@v5
5050
with:
5151
python-version: "3.11"
5252
cache: pip

‎.github/workflows/reusable-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
git fetch origin ${{ env.refspec_base }} --shallow-since="${DATE}" \
4242
--no-tags --prune --no-recurse-submodules
4343
- name: 'Set up Python'
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v5
4545
with:
4646
python-version: '3'
4747
cache: 'pip'
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
- uses: actions/checkout@v4
7474
- name: 'Set up Python'
75-
uses: actions/setup-python@v4
75+
uses: actions/setup-python@v5
7676
with:
7777
python-version: '3.11' # known to work with Sphinx 4.2
7878
cache: 'pip'

‎.github/workflows/reusable-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
config_hash:
55
required: true
66
type: string
7-
free-threaded:
7+
free-threading:
88
required: false
99
type: boolean
1010
default: false
@@ -35,7 +35,7 @@ jobs:
3535
./configure \
3636
--config-cache \
3737
--with-pydebug \
38-
${{ inputs.free-threaded && '--disable-gil' || '' }} \
38+
${{ inputs.free-threading && '--disable-gil' || '' }} \
3939
--prefix=/opt/python-dev \
4040
--with-openssl="$(brew --prefix openssl@3.0)"
4141
- name: Build CPython

‎.github/workflows/reusable-windows.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
workflow_call:
33
inputs:
4-
free-threaded:
4+
free-threading:
55
required: false
66
type: boolean
77
default: false
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Build CPython
19-
run: .\PCbuild\build.bat -e -d -v -p Win32 ${{ inputs.free-threaded && '--disable-gil' || '' }}
19+
run: .\PCbuild\build.bat -e -d -v -p Win32 ${{ inputs.free-threading && '--disable-gil' || '' }}
2020
- name: Display build info
2121
run: .\python.bat -m test.pythoninfo
2222
- name: Tests
@@ -33,7 +33,7 @@ jobs:
3333
- name: Register MSVC problem matcher
3434
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
3535
- name: Build CPython
36-
run: .\PCbuild\build.bat -e -d -v -p x64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
36+
run: .\PCbuild\build.bat -e -d -v -p x64 ${{ inputs.free-threading && '--disable-gil' || '' }}
3737
- name: Display build info
3838
run: .\python.bat -m test.pythoninfo
3939
- name: Tests
@@ -50,4 +50,4 @@ jobs:
5050
- name: Register MSVC problem matcher
5151
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
5252
- name: Build CPython
53-
run: .\PCbuild\build.bat -e -d -v -p arm64 ${{ inputs.free-threaded && '--disable-gil' || '' }}
53+
run: .\PCbuild\build.bat -e -d -v -p arm64 ${{ inputs.free-threading && '--disable-gil' || '' }}

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: "Check PRs"
19-
uses: actions/stale@v8
19+
uses: actions/stale@v9
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'

‎.github/workflows/verify-ensurepip-wheels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 10
2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: actions/setup-python@v4
29+
- uses: actions/setup-python@v5
3030
with:
3131
python-version: '3'
3232
- name: Compare checksum of bundled wheels to the ones published on PyPI

‎Doc/c-api/exceptions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ Querying the error indicator
440440
.. c:function:: PyObject *PyErr_GetRaisedException(void)
441441
442442
Return the exception currently being raised, clearing the error indicator at
443-
the same time.
443+
the same time. Return ``NULL`` if the error indicator is not set.
444444
445445
This function is used by code that needs to catch exceptions,
446446
or code that needs to save and restore the error indicator temporarily.

‎Doc/data/refcounts.dat‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,6 +1589,13 @@ PyObject_Call:PyObject*:callable_object:0:
15891589
PyObject_Call:PyObject*:args:0:
15901590
PyObject_Call:PyObject*:kw:0:
15911591

1592+
PyObject_CallNoArgs:PyObject*::+1:
1593+
PyObject_CallNoArgs:PyObject*:callable_object:0:
1594+
1595+
PyObject_CallOneArg:PyObject*::+1:
1596+
PyObject_CallOneArg:PyObject*:callable_object:0:
1597+
PyObject_CallOneArg:PyObject*:arg:0:
1598+
15921599
PyObject_CallFunction:PyObject*::+1:
15931600
PyObject_CallFunction:PyObject*:callable_object:0:
15941601
PyObject_CallFunction:const char*:format::

0 commit comments

Comments
 (0)