From 5cf24a3495960354fd3dd8a11c68b7580a1785a8 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 6 Jun 2024 06:28:07 -0400 Subject: [PATCH] Update to 3.13.0b2. --- cpython-unix/build-cpython.sh | 7 -- cpython-unix/patch-cpython-pr-119712.patch | 138 --------------------- pythonbuild/downloads.py | 6 +- src/validation.rs | 1 + 4 files changed, 4 insertions(+), 148 deletions(-) delete mode 100644 cpython-unix/patch-cpython-pr-119712.patch diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh index 760ee67d..4e3524a5 100755 --- a/cpython-unix/build-cpython.sh +++ b/cpython-unix/build-cpython.sh @@ -149,13 +149,6 @@ else patch -p1 -i ${ROOT}/patch-macos-link-extension-modules.patch fi -# Header files generated by Argument Clinic in 3.13.0b1 are missing -# an #include directive; PR 119712 corrected this. -# FIXME: remove during update to support 3.13.0b2 -if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then - patch -p1 -i ${ROOT}/patch-cpython-pr-119712.patch -fi - # Also on macOS, the `python` executable is linked against libraries defined by statically # linked modules. But those libraries should only get linked into libpython, not the # executable. This behavior is kinda suspect on all platforms, as it could be adding diff --git a/cpython-unix/patch-cpython-pr-119712.patch b/cpython-unix/patch-cpython-pr-119712.patch deleted file mode 100644 index 04f5121d..00000000 --- a/cpython-unix/patch-cpython-pr-119712.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff a/Modules/_ctypes/clinic/_ctypes.c.h b/Modules/_ctypes/clinic/_ctypes.c.h ---- a/Modules/_ctypes/clinic/_ctypes.c.h -+++ b/Modules/_ctypes/clinic/_ctypes.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_abstract.h" // _PyNumber_Index() - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - -diff a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h ---- a/Modules/_io/clinic/bufferedio.c.h -+++ b/Modules/_io/clinic/bufferedio.c.h -@@ -4,7 +4,7 @@ preserve - - #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - # include "pycore_gc.h" // PyGC_Head --# include "pycore_runtime.h" // _Py_ID() -+# include "pycore_runtime.h" // _Py_SINGLETON() - #endif - #include "pycore_abstract.h" // _PyNumber_Index() - #include "pycore_critical_section.h"// Py_BEGIN_CRITICAL_SECTION() -diff a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h ---- a/Modules/_io/clinic/iobase.c.h -+++ b/Modules/_io/clinic/iobase.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_abstract.h" // _Py_convert_optional_to_ssize_t() - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - -diff a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h ---- a/Modules/_io/clinic/textio.c.h -+++ b/Modules/_io/clinic/textio.c.h -@@ -4,7 +4,7 @@ preserve - - #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - # include "pycore_gc.h" // PyGC_Head --# include "pycore_runtime.h" // _Py_ID() -+# include "pycore_runtime.h" // _Py_SINGLETON() - #endif - #include "pycore_abstract.h" // _Py_convert_optional_to_ssize_t() - #include "pycore_critical_section.h"// Py_BEGIN_CRITICAL_SECTION() -diff a/Modules/clinic/_curses_panel.c.h b/Modules/clinic/_curses_panel.c.h ---- a/Modules/clinic/_curses_panel.c.h -+++ b/Modules/clinic/_curses_panel.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - - PyDoc_STRVAR(_curses_panel_panel_bottom__doc__, -diff a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h ---- a/Modules/clinic/_dbmmodule.c.h -+++ b/Modules/clinic/_dbmmodule.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - - PyDoc_STRVAR(_dbm_dbm_close__doc__, -diff a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h ---- a/Modules/clinic/_elementtree.c.h -+++ b/Modules/clinic/_elementtree.c.h -@@ -4,7 +4,7 @@ preserve - - #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - # include "pycore_gc.h" // PyGC_Head --# include "pycore_runtime.h" // _Py_ID() -+# include "pycore_runtime.h" // _Py_SINGLETON() - #endif - #include "pycore_abstract.h" // _PyNumber_Index() - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() -diff a/Modules/clinic/_gdbmmodule.c.h b/Modules/clinic/_gdbmmodule.c.h ---- a/Modules/clinic/_gdbmmodule.c.h -+++ b/Modules/clinic/_gdbmmodule.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_modsupport.h" // _PyArg_CheckPositional() - - PyDoc_STRVAR(_gdbm_gdbm_get__doc__, -diff a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h ---- a/Modules/clinic/_pickle.c.h -+++ b/Modules/clinic/_pickle.c.h -@@ -4,7 +4,7 @@ preserve - - #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - # include "pycore_gc.h" // PyGC_Head --# include "pycore_runtime.h" // _Py_ID() -+# include "pycore_runtime.h" // _Py_SINGLETON() - #endif - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - -diff a/Modules/clinic/arraymodule.c.h b/Modules/clinic/arraymodule.c.h ---- a/Modules/clinic/arraymodule.c.h -+++ b/Modules/clinic/arraymodule.c.h -@@ -2,6 +2,9 @@ - preserve - [clinic start generated code]*/ - -+#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -+# include "pycore_runtime.h" // _Py_SINGLETON() -+#endif - #include "pycore_abstract.h" // _PyNumber_Index() - #include "pycore_modsupport.h" // _PyArg_CheckPositional() - -diff a/Modules/clinic/pyexpat.c.h b/Modules/clinic/pyexpat.c.h ---- a/Modules/clinic/pyexpat.c.h -+++ b/Modules/clinic/pyexpat.c.h -@@ -4,7 +4,7 @@ preserve - - #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) - # include "pycore_gc.h" // PyGC_Head --# include "pycore_runtime.h" // _Py_ID() -+# include "pycore_runtime.h" // _Py_SINGLETON() - #endif - #include "pycore_modsupport.h" // _PyArg_UnpackKeywords() - diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py index 996d910d..6ebfbeb3 100644 --- a/pythonbuild/downloads.py +++ b/pythonbuild/downloads.py @@ -80,10 +80,10 @@ "python_tag": "cp312", }, "cpython-3.13": { - "url": "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b1.tar.xz", + "url": "https://www.python.org/ftp/python/3.13.0/Python-3.13.0b2.tar.xz", "size": 21054240, - "sha256": "ba716ac56b039b545ad4a90ce586a57aa97869364553746ef2445728ceec198e", - "version": "3.13.0b1", + "sha256": "bf11be01b42a07a3659e4e233591e03da631b7112aa61ee1e030eeb8c5dfd869", + "version": "3.13.0b2", "licenses": ["Python-2.0", "CNRI-Python"], "license_file": "LICENSE.cpython.txt", "python_tag": "cp313", diff --git a/src/validation.rs b/src/validation.rs index 0a1257be..7e015a79 100644 --- a/src/validation.rs +++ b/src/validation.rs @@ -724,6 +724,7 @@ const GLOBAL_EXTENSIONS_PYTHON_3_12: &[&str] = &[ "_zoneinfo", ]; +// FIXME: ensure that this list is correct for 3.13 const GLOBAL_EXTENSIONS_PYTHON_3_13: &[&str] = &[ "_interpchannels", "_interpqueues",