Mailman 3 March 2025 - Python-checkins

[3.12] gh-129917: Update installers to use SQLite 3.49.1 (#131025) (#131958)
by erlend-aasland March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/b1bbd0160d2202bc686cef4c80d42023eb… commit: b1bbd0160d2202bc686cef4c80d42023eb085bff branch: 3.12 author: Erlend E. Aasland <erlend(a)python.org> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-03-31T21:39:06Z summary: [3.12] gh-129917: Update installers to use SQLite 3.49.1 (#131025) (#131958) (cherry picked from commit 45a3ab5a81769eadd94da3e26eb9bb2f3ae80fb1) Co-authored-by: Ned Deily <nad(a)python.org> files: A Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst A Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst M Mac/BuildScript/build-installer.py M Misc/externals.spdx.json M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 90f2b685c84da6..586868c9675584 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -359,9 +359,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.45.3", - url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz", - checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531", + name="SQLite 3.49.1", + url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", + checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' @@ -372,11 +372,10 @@ def library_recipes(): ), configure_pre=[ '--enable-threadsafe', - '--enable-shared=no', - '--enable-static=yes', '--disable-readline', '--disable-dependency-tracking', - ] + ], + install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}", ), ]) diff --git a/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst new file mode 100644 index 00000000000000..0764232bb5f434 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst @@ -0,0 +1 @@ +Update Windows installer to ship with SQLite 3.49.1. diff --git a/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst new file mode 100644 index 00000000000000..c82feb3efebba7 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst @@ -0,0 +1 @@ +Update macOS installer to ship with SQLite 3.49.1. diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 7a6bd2c9ec0fe1..2ad84996cd169e 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -69,21 +69,21 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" + "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2" } ], - "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45…", + "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49…", "externalRefs": [ { "referenceCategory": "SECURITY", - "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.45.3.0:*:*:*:*:*:*:*", + "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.49.1.0:*:*:*:*:*:*:*", "referenceType": "cpe23Type" } ], "licenseConcluded": "NOASSERTION", "name": "sqlite", "primaryPackagePurpose": "SOURCE", - "versionInfo": "3.45.3.0" + "versionInfo": "3.49.1.0" }, { "SPDXID": "SPDXRef-PACKAGE-tcl-core", diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 5e8e30fdb5dfd1..777892387c9e53 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16 -set libraries=%libraries% sqlite-3.45.3.0 +set libraries=%libraries% sqlite-3.49.1.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 diff --git a/PCbuild/python.props b/PCbuild/python.props index 385072f3893ac6..cce140fcad77ee 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -68,7 +68,7 @@ <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> <PropertyGroup> - <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir> + <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir> <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index e054a94cf578bf..212c1e8eb0b92a 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -189,7 +189,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.45.3, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj Homepage: https://www.sqlite.org/ _tkinter

1 0

[3.13] gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (#131957)
by erlend-aasland March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/67087d9327cf1dba5df5d2d8a4a3d19d14… commit: 67087d9327cf1dba5df5d2d8a4a3d19d1497e554 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-03-31T21:37:14Z summary: [3.13] gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (#131957) gh-129917: Update installers to use SQLite 3.49.1 (GH-131025) (cherry picked from commit 45a3ab5a81769eadd94da3e26eb9bb2f3ae80fb1) Co-authored-by: Erlend E. Aasland <erlend(a)python.org> Co-authored-by: Ned Deily <nad(a)python.org> files: A Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst A Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst M Android/android.py M Mac/BuildScript/build-installer.py M Misc/externals.spdx.json M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Android/android.py b/Android/android.py index ae630aa8f4427c..a2a31b23f6403b 100755 --- a/Android/android.py +++ b/Android/android.py @@ -139,7 +139,7 @@ def make_build_python(context): def unpack_deps(host): deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download" for name_ver in ["bzip2-1.0.8-2", "libffi-3.4.4-3", "openssl-3.0.15-4", - "sqlite-3.45.3-3", "xz-5.4.6-1"]: + "sqlite-3.49.1-0", "xz-5.4.6-1"]: filename = f"{name_ver}-{host}.tar.gz" download(f"{deps_url}/{name_ver}/{filename}") run(["tar", "-xf", filename]) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index f5f0ed44884142..10e64a89532f79 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -359,9 +359,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.45.3", - url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz", - checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531", + name="SQLite 3.49.1", + url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", + checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' @@ -372,11 +372,10 @@ def library_recipes(): ), configure_pre=[ '--enable-threadsafe', - '--enable-shared=no', - '--enable-static=yes', '--disable-readline', '--disable-dependency-tracking', - ] + ], + install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}", ), dict( name="libmpdec 4.0.0", diff --git a/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst new file mode 100644 index 00000000000000..0764232bb5f434 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst @@ -0,0 +1 @@ +Update Windows installer to ship with SQLite 3.49.1. diff --git a/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst new file mode 100644 index 00000000000000..c82feb3efebba7 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst @@ -0,0 +1 @@ +Update macOS installer to ship with SQLite 3.49.1. diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 5b844b28bb1521..40518e8844e4bc 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -91,21 +91,21 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" + "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2" } ], - "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45…", + "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49…", "externalRefs": [ { "referenceCategory": "SECURITY", - "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.45.3.0:*:*:*:*:*:*:*", + "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.49.1.0:*:*:*:*:*:*:*", "referenceType": "cpe23Type" } ], "licenseConcluded": "NOASSERTION", "name": "sqlite", "primaryPackagePurpose": "SOURCE", - "versionInfo": "3.45.3.0" + "versionInfo": "3.49.1.0" }, { "SPDXID": "SPDXRef-PACKAGE-tcl-core", diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 50493486d334b9..dd4ca00c5c4cb1 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,7 +55,7 @@ set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16 set libraries=%libraries% mpdecimal-4.0.0 -set libraries=%libraries% sqlite-3.45.3.0 +set libraries=%libraries% sqlite-3.49.1.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0 set libraries=%libraries% xz-5.2.5 diff --git a/PCbuild/python.props b/PCbuild/python.props index e3c7fd225ed796..087f0b588b9f42 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -68,7 +68,7 @@ <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> <PropertyGroup> - <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir> + <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir> <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 42d87fc9cd8e64..f2c70de5b481e4 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -191,7 +191,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.45.3, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj Homepage: https://www.sqlite.org/ _tkinter

1 0

gh-129917: Update installers to use SQLite 3.49.1 (#131025)
by erlend-aasland March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/45a3ab5a81769eadd94da3e26eb9bb2f3a… commit: 45a3ab5a81769eadd94da3e26eb9bb2f3ae80fb1 branch: main author: Erlend E. Aasland <erlend(a)python.org> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-03-31T23:13:17+02:00 summary: gh-129917: Update installers to use SQLite 3.49.1 (#131025) Co-authored-by: Ned Deily <nad(a)python.org> files: A Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst A Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst M Android/android.py M Mac/BuildScript/build-installer.py M Misc/externals.spdx.json M PCbuild/get_externals.bat M PCbuild/python.props M PCbuild/readme.txt diff --git a/Android/android.py b/Android/android.py index ae630aa8f4427c..a2a31b23f6403b 100755 --- a/Android/android.py +++ b/Android/android.py @@ -139,7 +139,7 @@ def make_build_python(context): def unpack_deps(host): deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download" for name_ver in ["bzip2-1.0.8-2", "libffi-3.4.4-3", "openssl-3.0.15-4", - "sqlite-3.45.3-3", "xz-5.4.6-1"]: + "sqlite-3.49.1-0", "xz-5.4.6-1"]: filename = f"{name_ver}-{host}.tar.gz" download(f"{deps_url}/{name_ver}/{filename}") run(["tar", "-xf", filename]) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index cb2484767e6449..04a0e31b46329d 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -359,9 +359,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.45.3", - url="https://sqlite.org/2024/sqlite-autoconf-3450300.tar.gz", - checksum="b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531", + name="SQLite 3.49.1", + url="https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz", + checksum="106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254", extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' @@ -372,11 +372,10 @@ def library_recipes(): ), configure_pre=[ '--enable-threadsafe', - '--enable-shared=no', - '--enable-static=yes', '--disable-readline', '--disable-dependency-tracking', - ] + ], + install=f"make && ranlib libsqlite3.a && make install DESTDIR={shellQuote(os.path.join(WORKDIR, 'libraries'))}", ), dict( name="libmpdec 4.0.0", diff --git a/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst new file mode 100644 index 00000000000000..0764232bb5f434 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-03-09-21-45-31.gh-issue-131025.hlS5EC.rst @@ -0,0 +1 @@ +Update Windows installer to ship with SQLite 3.49.1. diff --git a/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst new file mode 100644 index 00000000000000..c82feb3efebba7 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2025-03-09-21-45-48.gh-issue-131025.VmKQkv.rst @@ -0,0 +1 @@ +Update macOS installer to ship with SQLite 3.49.1. diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json index 1ff2c8d7477313..13be10ca039286 100644 --- a/Misc/externals.spdx.json +++ b/Misc/externals.spdx.json @@ -91,21 +91,21 @@ "checksums": [ { "algorithm": "SHA256", - "checksumValue": "730e4a3efd6a63828bee499940fb13acc2a32c182502ce8a1d970387895d0504" + "checksumValue": "e335aeb44fa36cde60ecbb6a9f8be6f5d449d645ce9b0199ee53a7e6728d19d2" } ], - "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.45…", + "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/sqlite-3.49…", "externalRefs": [ { "referenceCategory": "SECURITY", - "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.45.3.0:*:*:*:*:*:*:*", + "referenceLocator": "cpe:2.3:a:sqlite:sqlite:3.49.1.0:*:*:*:*:*:*:*", "referenceType": "cpe23Type" } ], "licenseConcluded": "NOASSERTION", "name": "sqlite", "primaryPackagePurpose": "SOURCE", - "versionInfo": "3.45.3.0" + "versionInfo": "3.49.1.0" }, { "SPDXID": "SPDXRef-PACKAGE-tcl-core", diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 4e4d5c6b53aec9..51a76866e840e3 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,7 +55,7 @@ set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.16 set libraries=%libraries% mpdecimal-4.0.0 -set libraries=%libraries% sqlite-3.45.3.0 +set libraries=%libraries% sqlite-3.49.1.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0 set libraries=%libraries% xz-5.2.5 diff --git a/PCbuild/python.props b/PCbuild/python.props index d923bfab8a13b4..514576ce14f47e 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -74,7 +74,7 @@ <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" /> <PropertyGroup> - <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir> + <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.49.1.0\</sqlite3Dir> <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index cbbee8bcea06d3..c02c12be5113b0 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -230,7 +230,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.45.3, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.49.1, which is itself built by sqlite3.vcxproj Homepage: https://www.sqlite.org/ _tkinter

1 0

GH-131296: Add missing UNREACHABLE mark in thread_nt.h (GH-131589)
by zooba March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/2e96f5ae4d1700d77a53180b4866c5b9f0… commit: 2e96f5ae4d1700d77a53180b4866c5b9f002e62d branch: main author: Chris Eibl <138194463+chris-eibl(a)users.noreply.github.com> committer: zooba <steve.dower(a)microsoft.com> date: 2025-03-31T20:28:35+01:00 summary: GH-131296: Add missing UNREACHABLE mark in thread_nt.h (GH-131589) files: M Python/thread_nt.h diff --git a/Python/thread_nt.h b/Python/thread_nt.h index 3a01a7fe327c8f..e078b98be3cdf4 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h @@ -289,6 +289,7 @@ PyThread_exit_thread(void) if (!initialized) exit(0); _endthreadex(0); + Py_UNREACHABLE(); } void _Py_NO_RETURN

1 0

[3.13] gh-131675: Fix `mi_atomic_yield` in mimalloc on 32-bit ARM (gh-131784) (gh-131954)
by colesbury March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/4913b6f944f6a8cff7eb52977a0fc05fed… commit: 4913b6f944f6a8cff7eb52977a0fc05fedbe8d4b branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-31T14:58:29-04:00 summary: [3.13] gh-131675: Fix `mi_atomic_yield` in mimalloc on 32-bit ARM (gh-131784) (gh-131954) Use the standard `__ARM_ARCH` macro, which is supported by GCC and Clang. The branching logic for of `__ARMEL__` has been removed so if the target architecture supports v7+ instructions, a yield is emitted, otherwise a nop is emitted. This covers both big and little endian scenarios. (cherry picked from commit 03f6c8e239723637811fd8d278661f5292351197) Signed-off-by: Vincent Fazio <vfazio(a)gmail.com> Co-authored-by: Vincent Fazio <vfazio(a)gmail.com> files: A Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst M Include/internal/mimalloc/mimalloc/atomic.h diff --git a/Include/internal/mimalloc/mimalloc/atomic.h b/Include/internal/mimalloc/mimalloc/atomic.h index 1093c540864bc1..a46a7676ad20b8 100644 --- a/Include/internal/mimalloc/mimalloc/atomic.h +++ b/Include/internal/mimalloc/mimalloc/atomic.h @@ -338,8 +338,9 @@ static inline void mi_atomic_yield(void) { _mm_pause(); } #elif (defined(__GNUC__) || defined(__clang__)) && \ - (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__armel__) || defined(__ARMEL__) || \ - defined(__aarch64__) || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)) || defined(__POWERPC__) + (defined(__x86_64__) || defined(__i386__) || \ + defined(__aarch64__) || defined(__arm__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__)) #if defined(__x86_64__) || defined(__i386__) static inline void mi_atomic_yield(void) { __asm__ volatile ("pause" ::: "memory"); @@ -348,10 +349,16 @@ static inline void mi_atomic_yield(void) { static inline void mi_atomic_yield(void) { __asm__ volatile("wfe"); } -#elif (defined(__arm__) && __ARM_ARCH__ >= 7) +#elif defined(__arm__) +#if __ARM_ARCH >= 7 static inline void mi_atomic_yield(void) { __asm__ volatile("yield" ::: "memory"); } +#else +static inline void mi_atomic_yield(void) { + __asm__ volatile ("nop" ::: "memory"); +} +#endif #elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__) #ifdef __APPLE__ static inline void mi_atomic_yield(void) { @@ -362,10 +369,6 @@ static inline void mi_atomic_yield(void) { __asm__ __volatile__ ("or 27,27,27" ::: "memory"); } #endif -#elif defined(__armel__) || defined(__ARMEL__) -static inline void mi_atomic_yield(void) { - __asm__ volatile ("nop" ::: "memory"); -} #endif #elif defined(__sun) // Fallback for other archs diff --git a/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst b/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst new file mode 100644 index 00000000000000..be870a81df1739 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst @@ -0,0 +1 @@ +Fix mimalloc library builds for 32-bit ARM targets.

1 0

gh-131675: Fix `mi_atomic_yield` in mimalloc on 32-bit ARM (gh-131784)
by colesbury March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/03f6c8e239723637811fd8d278661f5292… commit: 03f6c8e239723637811fd8d278661f5292351197 branch: main author: Vincent Fazio <vfazio(a)gmail.com> committer: colesbury <colesbury(a)gmail.com> date: 2025-03-31T18:29:12Z summary: gh-131675: Fix `mi_atomic_yield` in mimalloc on 32-bit ARM (gh-131784) Use the standard `__ARM_ARCH` macro, which is supported by GCC and Clang. The branching logic for of `__ARMEL__` has been removed so if the target architecture supports v7+ instructions, a yield is emitted, otherwise a nop is emitted. This covers both big and little endian scenarios. Signed-off-by: Vincent Fazio <vfazio(a)gmail.com> files: A Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst M Include/internal/mimalloc/mimalloc/atomic.h diff --git a/Include/internal/mimalloc/mimalloc/atomic.h b/Include/internal/mimalloc/mimalloc/atomic.h index cdd9c372beafd5..65fa477d643782 100644 --- a/Include/internal/mimalloc/mimalloc/atomic.h +++ b/Include/internal/mimalloc/mimalloc/atomic.h @@ -338,8 +338,9 @@ static inline void mi_atomic_yield(void) { _mm_pause(); } #elif (defined(__GNUC__) || defined(__clang__)) && \ - (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__armel__) || defined(__ARMEL__) || \ - defined(__aarch64__) || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)) || defined(__POWERPC__) + (defined(__x86_64__) || defined(__i386__) || \ + defined(__aarch64__) || defined(__arm__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__)) #if defined(__x86_64__) || defined(__i386__) static inline void mi_atomic_yield(void) { __asm__ volatile ("pause" ::: "memory"); @@ -348,10 +349,16 @@ static inline void mi_atomic_yield(void) { static inline void mi_atomic_yield(void) { __asm__ volatile("wfe"); } -#elif (defined(__arm__) && __ARM_ARCH__ >= 7) +#elif defined(__arm__) +#if __ARM_ARCH >= 7 static inline void mi_atomic_yield(void) { __asm__ volatile("yield" ::: "memory"); } +#else +static inline void mi_atomic_yield(void) { + __asm__ volatile ("nop" ::: "memory"); +} +#endif #elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__) #ifdef __APPLE__ static inline void mi_atomic_yield(void) { @@ -362,10 +369,6 @@ static inline void mi_atomic_yield(void) { __asm__ __volatile__ ("or 27,27,27" ::: "memory"); } #endif -#elif defined(__armel__) || defined(__ARMEL__) -static inline void mi_atomic_yield(void) { - __asm__ volatile ("nop" ::: "memory"); -} #endif #elif defined(__sun) // Fallback for other archs diff --git a/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst b/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst new file mode 100644 index 00000000000000..be870a81df1739 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-27-01-21-50.gh-issue-131675.l2zfOO.rst @@ -0,0 +1 @@ +Fix mimalloc library builds for 32-bit ARM targets.

1 0

[3.12] gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) (#131951)
by vstinner March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/b87ea7d4e3659179786713143398dc8e73… commit: b87ea7d4e3659179786713143398dc8e731bb2e4 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-31T18:29:04Z summary: [3.12] gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) (#131951) gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) When using --with-dtrace the resulting object file could be missing specific CFLAGS exported by the build system due to the systemtap script using specific defaults. Exporting the CC and CFLAGS variables before the dtrace invocation allows us to properly apply CFLAGS exported by the build system even when cross-compiling. The fix does not affect the dtrace invocation on Solaris/macOS. (cherry picked from commit 0cd4befb02df07c0b320cd6246227c13e57b2efb) Co-authored-by: stratakis <cstratak(a)redhat.com> files: A Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst M Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in index c6943ea8231c51..7ca3dc62c01555 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1574,7 +1574,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT) # an include guard, so we can't use a pipeline to transform its output. Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d $(MKDIR_P) Include - $(DTRACE) $(DFLAGS) -o $@ -h -s $< + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $< : sed in-place edit with POSIX-only tools sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp mv $@.tmp $@ @@ -1584,7 +1584,7 @@ Python/import.o: $(srcdir)/Include/pydtrace.h Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) - $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) Objects/typeobject.o: Objects/typeslots.inc diff --git a/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst new file mode 100644 index 00000000000000..a287e0b22834f3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst @@ -0,0 +1,2 @@ +The DTrace build now properly passes the ``CC`` and ``CFLAGS`` variables +to the ``dtrace`` command when utilizing SystemTap on Linux.

1 0

[3.13] gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) (#131950)
by vstinner March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/29b958a36b8c18a289701f77c922831fe0… commit: 29b958a36b8c18a289701f77c922831fe0151d53 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-31T20:15:45+02:00 summary: [3.13] gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) (#131950) gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (GH-131866) When using --with-dtrace the resulting object file could be missing specific CFLAGS exported by the build system due to the systemtap script using specific defaults. Exporting the CC and CFLAGS variables before the dtrace invocation allows us to properly apply CFLAGS exported by the build system even when cross-compiling. The fix does not affect the dtrace invocation on Solaris/macOS. (cherry picked from commit 0cd4befb02df07c0b320cd6246227c13e57b2efb) Co-authored-by: stratakis <cstratak(a)redhat.com> files: A Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst M Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in index 2585be280533b4..3bd4495f95b7a9 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1998,7 +1998,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT) # an include guard, so we can't use a pipeline to transform its output. Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d $(MKDIR_P) Include - $(DTRACE) $(DFLAGS) -o $@ -h -s $< + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $< : sed in-place edit with POSIX-only tools sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp mv $@.tmp $@ @@ -2008,7 +2008,7 @@ Python/gc.o: $(srcdir)/Include/pydtrace.h Python/import.o: $(srcdir)/Include/pydtrace.h Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) - $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) Objects/typeobject.o: Objects/typeslots.inc diff --git a/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst new file mode 100644 index 00000000000000..a287e0b22834f3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst @@ -0,0 +1,2 @@ +The DTrace build now properly passes the ``CC`` and ``CFLAGS`` variables +to the ``dtrace`` command when utilizing SystemTap on Linux.

1 0

[3.13] gh-131936: Strengthen check in `_suggestions._generate_suggestions` (GH-131945) (#131949)
by vstinner March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/d52371c8cdafeb61df92e9cea6b02e3c4d… commit: d52371c8cdafeb61df92e9cea6b02e3c4d052765 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-31T17:54:20Z summary: [3.13] gh-131936: Strengthen check in `_suggestions._generate_suggestions` (GH-131945) (#131949) gh-131936: Strengthen check in `_suggestions._generate_suggestions` (GH-131945) (cherry picked from commit 511d3440a0bbb19731f4d96dde65dffbf85cdda5) Co-authored-by: Peter Bierma <zintensitydev(a)gmail.com> files: M Lib/test/test_traceback.py M Modules/_suggestions.c diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index adc413d47d662c..2dfee81681d42d 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -4615,7 +4615,31 @@ def test_levenshtein_distance_short_circuit(self): @cpython_only def test_suggestions_extension(self): # Check that the C extension is available - import _suggestions # noqa: F401 + import _suggestions + + self.assertEqual( + _suggestions._generate_suggestions( + ["hello", "world"], + "hell" + ), + "hello" + ) + self.assertEqual( + _suggestions._generate_suggestions( + ["hovercraft"], + "eels" + ), + None + ) + + # gh-131936: _generate_suggestions() doesn't accept list subclasses + class MyList(list): + pass + + with self.assertRaises(TypeError): + _suggestions._generate_suggestions(MyList(), "") + + class TestColorizedTraceback(unittest.TestCase): diff --git a/Modules/_suggestions.c b/Modules/_suggestions.c index 80c7179c4c251c..b8bc6db2477281 100644 --- a/Modules/_suggestions.c +++ b/Modules/_suggestions.c @@ -21,7 +21,7 @@ _suggestions__generate_suggestions_impl(PyObject *module, /*[clinic end generated code: output=79be7b653ae5e7ca input=ba2a8dddc654e33a]*/ { // Check if dir is a list - if (!PyList_Check(candidates)) { + if (!PyList_CheckExact(candidates)) { PyErr_SetString(PyExc_TypeError, "candidates must be a list"); return NULL; }

1 0

gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (#131866)
by vstinner March 31, 2025

March 31, 2025

https://github.com/python/cpython/commit/0cd4befb02df07c0b320cd6246227c13e5… commit: 0cd4befb02df07c0b320cd6246227c13e57b2efb branch: main author: stratakis <cstratak(a)redhat.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-31T17:53:49Z summary: gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds (#131866) When using --with-dtrace the resulting object file could be missing specific CFLAGS exported by the build system due to the systemtap script using specific defaults. Exporting the CC and CFLAGS variables before the dtrace invocation allows us to properly apply CFLAGS exported by the build system even when cross-compiling. The fix does not affect the dtrace invocation on Solaris/macOS. files: A Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst M Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in index 9658bfa44b98e4..2102f9cfe882bd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2090,7 +2090,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT) # an include guard, so we can't use a pipeline to transform its output. Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d $(MKDIR_P) Include - $(DTRACE) $(DFLAGS) -o $@ -h -s $< + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $< : sed in-place edit with POSIX-only tools sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp mv $@.tmp $@ @@ -2100,7 +2100,7 @@ Python/gc.o: $(srcdir)/Include/pydtrace.h Python/import.o: $(srcdir)/Include/pydtrace.h Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) - $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) + CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) Objects/typeobject.o: Objects/typeslots.inc diff --git a/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst new file mode 100644 index 00000000000000..a287e0b22834f3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-31-19-22-41.gh-issue-131865.PIJy7X.rst @@ -0,0 +1,2 @@ +The DTrace build now properly passes the ``CC`` and ``CFLAGS`` variables +to the ``dtrace`` command when utilizing SystemTap on Linux.

1 0