8000 Merge branch 'main' into add_tests_for_site_cli · python/cpython@d0999d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit d0999d2

Browse files
ggqlqggqlq
authored
Merge branch 'main' into add_tests_for_site_cli
2 parents 1a8f291 + 2e1544f commit d0999d2

File tree

153 files changed

+3976
-1664
lines changed

Some content is hidden

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

153 files changed

+3976
-1664
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:2025.05.25.15232270922",
2+
"image": "ghcr.io/python/devcontainer:2025.05.29.15334414373",
33
"onCreateCommand": [
44
// Install common tooling.
55
"dnf",

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,5 +171,10 @@ Python/frozen_modules/MANIFEST
171171
/python
172172
!/Python/
173173

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

‎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)
0