Skip to content

Commit 5cb83bc

Browse files
authored
Merge branch 'main' into unquote-ascii
2 parents 7eeba76 + c436e8d commit 5cb83bc

2 files changed

Lines changed: 3 additions & 13 deletions

File tree

‎.github/workflows/jit.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,16 @@ jobs:
8787
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
8888
8989
macos:
90-
name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
90+
name: aarch64-apple-darwin/clang (${{ matrix.debug && 'Debug' || 'Release' }})
9191

92-
runs-on: ${{ matrix.runner }}
92+
runs-on: macos-26
9393
timeout-minutes: 60
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
target:
98-
- x86_64-apple-darwin/clang
99-
- aarch64-apple-darwin/clang
10097
debug:
10198
- true
10299
- false
103-
include:
104-
- target: x86_64-apple-darwin/clang
105-
runner: macos-26-intel
106-
- target: aarch64-apple-darwin/clang
107-
runner: macos-26
108100
steps:
109101
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
110102
with:

‎Doc/glossary.rst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -727,9 +727,7 @@ Glossary
727727
when doing I/O.
728728

729729
As of Python 3.13, the GIL can be disabled using the :option:`--disable-gil`
730-
build configuration. After building Python with this option, code must be
731-
run with :option:`-X gil=0 <-X>` or after setting the :envvar:`PYTHON_GIL=0 <PYTHON_GIL>`
732-
environment variable. This feature enables improved performance for
730+
build configuration. This feature enables improved performance for
733731
multi-threaded applications and makes it easier to use multi-core CPUs
734732
efficiently. For more details, see :pep:`703`.
735733

0 commit comments

Comments
 (0)