Skip to content

Commit

Permalink
Merge pull request #3756 from citrus-it/pythonr52
Browse files Browse the repository at this point in the history
python312 - update from 3.12.7 to 3.12.8 (r151052)
  • Loading branch information
oetiker authored Dec 9, 2024
2 parents 7ceacad + a6e9a0f commit 459f7b6
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build/python312/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=Python
VER=3.12.7
VER=3.12.8
PKG=runtime/python-312
MVER=${VER%.*}
SUMMARY="$PROG $MVER"
Expand Down
2 changes: 1 addition & 1 deletion build/python312/patches/disable_epoll.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ There is no nice way to tell configure that we don't have it
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -4966,8 +4966,8 @@ PY_CHECK_FUNC([symlink], [@%:@include <u
@@ -4969,8 +4969,8 @@ PY_CHECK_FUNC([symlink], [@%:@include <u
PY_CHECK_FUNC([fchdir], [@%:@include <unistd.h>])
PY_CHECK_FUNC([fsync], [@%:@include <unistd.h>])
PY_CHECK_FUNC([fdatasync], [@%:@include <unistd.h>])
Expand Down
4 changes: 2 additions & 2 deletions build/python312/patches/gethostbyname.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ correct when building with XPG6.
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -5564,26 +5564,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],
@@ -5569,26 +5569,8 @@ AH_TEMPLATE([HAVE_GETHOSTBYNAME_R],

AC_CHECK_FUNC([gethostbyname_r],
[AC_DEFINE([HAVE_GETHOSTBYNAME_R])
Expand All @@ -32,7 +32,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
AC_MSG_CHECKING([gethostbyname_r with 5 args])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
# include <netdb.h>
@@ -5622,7 +5604,6 @@ AC_CHECK_FUNC([gethostbyname_r],
@@ -5627,7 +5609,6 @@ AC_CHECK_FUNC([gethostbyname_r],
AC_MSG_RESULT([no])
])
])
Expand Down
4 changes: 2 additions & 2 deletions build/python312/patches/locale-encoding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Include/unicodeobject.h a/Inc
diff -wpruN --no-dereference '--exclude=*.orig' a~/Objects/unicodeobject.c a/Objects/unicodeobject.c
--- a~/Objects/unicodeobject.c 1970-01-01 00:00:00
+++ a/Objects/unicodeobject.c 1970-01-01 00:00:00
@@ -1792,6 +1792,15 @@ unicode_char(Py_UCS4 ch)
@@ -1959,6 +1959,15 @@ unicode_char(Py_UCS4 ch)
return unicode;
}

Expand All @@ -43,7 +43,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Objects/unicodeobject.c a/Obj
PyObject *
PyUnicode_FromWideChar(const wchar_t *u, Py_ssize_t size)
{
@@ -1828,6 +1837,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
@@ -1995,6 +2004,58 @@ PyUnicode_FromWideChar(const wchar_t *u,
return unicode;
}
#endif
Expand Down
6 changes: 3 additions & 3 deletions build/python312/patches/posix_spawn-close_fds-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
default: {
PyErr_SetString(PyExc_TypeError,
"Unknown file_actions identifier");
@@ -16505,6 +16526,9 @@ all_ins(PyObject *m)
@@ -16515,6 +16536,9 @@ all_ins(PyObject *m)
if (PyModule_AddIntConstant(m, "POSIX_SPAWN_OPEN", POSIX_SPAWN_OPEN)) return -1;
if (PyModule_AddIntConstant(m, "POSIX_SPAWN_CLOSE", POSIX_SPAWN_CLOSE)) return -1;
if (PyModule_AddIntConstant(m, "POSIX_SPAWN_DUP2", POSIX_SPAWN_DUP2)) return -1;
Expand All @@ -117,7 +117,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/Modules/posixmodule.c a/Modul
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -4930,6 +4930,7 @@ AC_CHECK_FUNCS([ \
@@ -4933,6 +4933,7 @@ AC_CHECK_FUNCS([ \
lockf lstat lutimes madvise mbrtowc memrchr mkdirat mkfifo mkfifoat \
mknod mknodat mktime mmap mremap nice openat opendir pathconf pause pipe \
pipe2 plock poll posix_fadvise posix_fallocate posix_spawn posix_spawnp \
Expand All @@ -128,7 +128,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
diff -wpruN --no-dereference '--exclude=*.orig' a~/pyconfig.h.in a/pyconfig.h.in
--- a~/pyconfig.h.in 1970-01-01 00:00:00
+++ a/pyconfig.h.in 1970-01-01 00:00:00
@@ -908,6 +908,10 @@
@@ -904,6 +904,10 @@
/* Define to 1 if you have the `posix_spawnp' function. */
#undef HAVE_POSIX_SPAWNP

Expand Down
53 changes: 49 additions & 4 deletions build/python312/testsuite.log
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== Tests result: SUCCESS ==
== Tests result: FAILURE ==

26 tests skipped:
test.test_asyncio.test_windows_events
Expand All @@ -14,8 +14,53 @@
test_ossaudiodev test_smtpnet test_socketserver test_urllib2net
test_urllibnet test_winsound test_xmlrpc_net test_zipfile64

2 tests failed:
test_multiprocessing_main_handling test_poplib

454 tests OK.

0:11:32 load avg: 0.11 Re-running 2 failed tests in verbose mode in subprocesses
0:11:32 load avg: 0.11 Run 2 tests in parallel using 2 worker processes
0:11:34 load avg: 0.12 [1/2] test_multiprocessing_main_handling passed
Re-running test_multiprocessing_main_handling in verbose mode (matching: test_zipfile_compiled)
test_zipfile_compiled (test.test_multiprocessing_main_handling.ForkCmdLineTest.test_zipfile_compiled) ... ok
test_zipfile_compiled (test.test_multiprocessing_main_handling.ForkServerCmdLineTest.test_zipfile_compiled) ... ok
test_zipfile_compiled (test.test_multiprocessing_main_handling.SpawnCmdLineTest.test_zipfile_compiled) ... ok

----------------------------------------------------------------------
Ran 3 tests in 1.132s

OK
0:11:50 load avg: 0.15 [2/2] test_poplib passed
Re-running test_poplib in verbose mode (matching: testTimeoutNone)
testTimeoutNone (test.test_poplib.TestTimeouts.testTimeoutNone) ... ok

----------------------------------------------------------------------
Ran 1 test in 16.921s

OK

== Tests result: FAILURE then SUCCESS ==

26 tests skipped:
test.test_asyncio.test_windows_events
test.test_asyncio.test_windows_utils test.test_gdb.test_backtrace
test.test_gdb.test_cfunction test.test_gdb.test_cfunction_full
test.test_gdb.test_misc test.test_gdb.test_pretty_print
test_dbm_gnu test_epoll test_idle test_kqueue test_launcher
test_msilib test_perf_profiler test_perfmaps test_startfile
test_tcl test_tix test_tkinter test_ttk test_ttk_textonly
test_turtle test_winapi test_winconsoleio test_winreg test_wmi

8 tests skipped (resource denied):
test_ossaudiodev test_smtpnet test_socketserver test_urllib2net
test_urllibnet test_winsound test_xmlrpc_net test_zipfile64

2 re-run tests:
test_multiprocessing_main_handling test_poplib

456 tests OK.

Total tests: run=41,968 (filtered) skipped=1,424
Total test files: run=482/490 (filtered) skipped=26 resource_denied=8
Result: SUCCESS
Total tests: run=42,149 (filtered) failures=1 skipped=1,547
Total test files: run=484/490 (filtered) skipped=26 resource_denied=8 rerun=2
Result: FAILURE then SUCCESS

0 comments on commit 459f7b6

Please sign in to comment.