Skip to content

Commit 8db665a

Browse files
tom-pyteltom-pytel
authored
Merge branch 'main' into fix-issue-128942-lockfree
2 parents d29c208 + 0f866cb commit 8db665a

File tree

510 files changed

+18713
-8132
lines changed

Some content is hidden

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

510 files changed

+18713
-8132
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/python/devcontainer:2024.09.25.11038928730",
2+
"image": "ghcr.io/python/devcontainer:2025.05.29.15334414373",
33
"onCreateCommand": [
44
// Install common tooling.
55
"dnf",

‎.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,8 @@ Modules/_xxtestfuzz/ @ammaraskar
331331
**/*templateobject* @lysnikolaou
332332
**/*templatelib* @lysnikolaou
333333
**/*tstring* @lysnikolaou
334+
335+
# Remote debugging
336+
Python/remote_debug.h @pablogsal
337+
Python/remote_debugging.c @pablogsal
338+
Modules/_remote_debugging_module.c @pablogsal @ambv @1st1

‎.github/workflows/posix-deps-apt.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ apt-get -yq install \
1717
libreadline6-dev \
1818
libsqlite3-dev \
1919
libssl-dev \
20+
libzstd-dev \
2021
lzma \
2122
lzma-dev \
2223
strace \

‎.github/workflows/tail-call.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,3 @@ jobs:
137137
CC=clang-20 ./configure --with-tail-call-interp --disable-gil
138138
make all --jobs 4
139139
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
140-

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ Tools/unicode/data/
131131
/autom4te.cache
132132
/build/
133133
/builddir/
134+
/compile_commands.json
134135
/config.cache
135136
/config.log
136137
/config.status
@@ -171,5 +172,10 @@ Python/frozen_modules/MANIFEST
171172
/python
172173
!/Python/
173174

175+
# People's custom https://docs.anthropic.com/en/docs/claude-code/memory configs.
176+
/.claude/
177+
CLAUDE.local.md
178+
179+
#### main branch only stuff below this line, things to backport go above. ####
174180
# main branch only: ABI files are not checked/maintained.
175181
Doc/data/python*.abi

‎.pre-commit-config.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ repos:
4343
exclude: ^Lib/test/test_tomllib/
4444
- id: check-yaml
4545
- id: end-of-file-fixer
46-
types: [python]
46+
types_or: [python, yaml]
4747
exclude: Lib/test/tokenizedata/coding20731.py
48+
- id: end-of-file-fixer
49+
files: '^\.github/CODEOWNERS$'
4850
- id: trailing-whitespace
49-
types_or: [c, inc, python, rst]
51+
types_or: [c, inc, python, rst, yaml]
5052
- id: trailing-whitespace
51-
files: '\.(gram)$'
53+
files: '^\.github/CODEOWNERS|\.(gram)$'
5254

5355
- repo: https://github.com/python-jsonschema/check-jsonschema
5456
rev: 0.33.0

‎.readthedocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ build:
3232
- make -C Doc venv html
3333
- mkdir _readthedocs
3434
- mv Doc/build/html _readthedocs/html
35-

‎Android/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ repository's `Lib` directory will be picked up immediately. Changes in C files,
156156
and architecture-specific files such as sysconfigdata, will not take effect
157157
until you re-run `android.py make-host` or `build`.
158158

159+
The testbed app can also be used to test third-party packages. For more details,
160+
run `android.py test --help`, paying attention to the options `--site-packages`,
161+
`--cwd`, `-c` and `-m`.
162+
159163

160164
## Using in your own app
161165

‎Android/android-env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
: "${HOST:?}" # GNU target triplet
44

55
# You may also override the following:
6-
: "${api_level:=24}" # Minimum Android API level the build will run on
6+
: "${ANDROID_API_LEVEL:=24}" # Minimum Android API level the build will run on
77
: "${PREFIX:-}" # Path in which to find required libraries
88

99

@@ -24,7 +24,7 @@ fail() {
2424
# * https://android.googlesource.com/platform/ndk/+/ndk-rXX-release/docs/BuildSystemMaintainers.md
2525
# where XX is the NDK version. Do a diff against the version you're upgrading from, e.g.:
2626
# https://android.googlesource.com/platform/ndk/+/ndk-r25-release..ndk-r26-release/docs/BuildSystemMaintainers.md
27-
ndk_version=27.1.12297006
27+
ndk_version=27.2.12479018
2828

2929
ndk=$ANDROID_HOME/ndk/$ndk_version
3030
if ! [ -e "$ndk" ]; then
@@ -43,7 +43,7 @@ fi
4343
toolchain=$(echo "$ndk"/toolchains/llvm/prebuilt/*)
4444
export AR="$toolchain/bin/llvm-ar"
4545
export AS="$toolchain/bin/llvm-as"
46-
export CC="$toolchain/bin/${clang_triplet}${api_level}-clang"
46+
export CC="$toolchain/bin/${clang_triplet}${ANDROID_API_LEVEL}-clang"
4747
export CXX="${CC}++"
4848
export LD="$toolchain/bin/ld"
4949
export NM="$toolchain/bin/llvm-nm"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy