Merge remote-tracking branch 'bjia56/python3.11' into freeorion-patches-android-5

Author: o01eg

.github/workflows/CI.yml

@@ -4,7 +4,15 @@ on:
   pull_request:
   push:
     branches:
-    - master
+    - portable-python
+  workflow_dispatch:
+    inputs:
+      verbose:
+        required: false
+        type: boolean
+
+env:
+  MACOSX_DEPLOYMENT_TARGET: 10.5
 
 jobs:
   tests:
@@ -13,49 +21,33 @@ jobs:
       fail-fast: false
       matrix:
         runs-on: [macos-latest]
-        python-version: [3.7.17, 3.8.17, 3.9.17]
-        include:
-          - runs-on: macos-latest
-            c-compiler: "clang"
-            cxx-compiler: "clang++"
-            initial-dashboard-cache: "CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.13"
+        python-version: [3.8.18, 3.9.18, 3.10.13, 3.11.7]
 
     name: python-${{ matrix.python-version }}-${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        path: src
 
     - name: Setup cmake
       uses: jwlawson/actions-setup-cmake@v1.13.1
       with:
         cmake-version: 3.13.5
 
-    - name: Setup ninja
-      uses: ashutoshvarma/setup-ninja@master
-      with:
-        version: 1.10.0
-
-    - name: Download dashboard script
-      uses: actions/checkout@v3
-      with:
-        repository: 'python-cmake-buildsystem/python-cmake-buildsystem'
-        ref: dashboard
-        fetch-depth: 0
-        path: scripts
-
-    - name: Writing initial dashboard cache
-      shell: bash
+    - name: Build
       run: |
-        cat > scripts/initial-dashboard-cache.txt << EOF
-        ${{ matrix.initial-dashboard-cache }}
-        EOF
-        cat scripts/initial-dashboard-cache.txt
-
-    - name: Build & Test
-      run: ctest --timeout 360 -S scripts/github_actions_dashboard.cmake -VV
-      env:
-        PY_VERSION: ${{ matrix.python-version }}
-        CC: ${{ matrix.c-compiler }}
-        CXX: ${{ matrix.cxx-compiler }}
+        mkdir -p python-build && mkdir -p python-install
+        cd python-build
+        cmake \
+          ${{ inputs.verbose && '--trace-expand --debug-find' || '' }} \
+          -DCMAKE_INSTALL_PREFIX:PATH=${{ github.workspace }}/python-install \
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MACOSX_DEPLOYMENT_TARGET }} \
+          -DCMAKE_C_STANDARD=11 \
+          -DPython3_EXECUTABLE=$(which python3) \
+          ${{ startsWith(matrix.python-version, '3.11') && '-DUSE_SYSTEM_TCL=OFF' || '' }} \
+          -DPYTHON_VERSION=${{ matrix.python-version }} \
+          ..
+        make -j4 ${{ inputs.verbose && 'VERBOSE=1' || '' }}
+        make install
+
+    - name: Test
+      run: |
+        ./python-install/bin/python -m test || true

CMakeLists.txt

@@ -138,8 +138,7 @@ endif()
 
 cmake_dependent_option(USE_BUILTIN_ZLIB "Use builtin ZLIB" ${_use_builtin_zlib_default} "NOT USE_SYSTEM_ZLIB" OFF)
 
-cmake_dependent_option(USE_LIBEDIT "Use libedit instead of readline" OFF
-                       "USE_SYSTEM_READLINE" OFF)
+option(USE_LIBEDIT "Use libedit instead of readline" OFF)
 
 option(WITH_TSC "profile with the Pentium timestamp counter" OFF)
 option(ENABLE_IPV6 "Enable IP v6" ON)
@@ -272,6 +271,7 @@ set(_download_3.8.14_md5 "a82168eb586e19122b747b84038825f2")
 set(_download_3.8.15_md5 "28b111e1e97a9e5acb62e1d153f188d9")
 set(_download_3.8.16_md5 "060040f864f1003b849b33393c9605df")
 set(_download_3.8.17_md5 "d3e789ab828016927a122a0ae9b0e6b0")
+set(_download_3.8.18_md5 "1c611d70ba4d0ec32da3a364490fc6f4")
 # 3.9.x
 set(_download_3.9.0_md5 "e19e75ec81dd04de27797bf3f9d918fd")
 set(_download_3.9.1_md5 "429ae95d24227f8fa1560684fad6fca7")
@@ -291,6 +291,7 @@ set(_download_3.9.14_md5 "324a9dcaaa11b2b0dafe5614e8f01145")
 set(_download_3.9.15_md5 "3e13283a5f4e089db508bf81b60a5cca")
 set(_download_3.9.16_md5 "38c99c7313f416dcf3238f5cf444c6c2")
 set(_download_3.9.17_md5 "ded6379983f364cf790793ca24dcfe3e")
+set(_download_3.9.18_md5 "c3a3e67e35838cadca247237a5a279a7")
 # 3.10.x
 set(_download_3.10.0_md5 "729e36388ae9a832b01cf9138921b383")
 set(_download_3.10.1_md5 "91822157a97da16203877400c810d93e")
@@ -306,6 +307,8 @@ set(_download_3.10.10_md5 "6dbe644dd1a520d9853cf6648084c346")
 set(_download_3.10.11_md5 "7e25e2f158b1259e271a45a249cb24bb")
 set(_download_3.10.12_md5 "1d64320e0b0df6e9ab7e611bacb2178d")
 set(_download_3.10.13_md5 "cbcad7f5e759176bf8ce8a5f9d487087")
+# 3.11.x
+set(_download_3.11.7_md5 "ef61f81ec82c490484219c7f0ec96783")
 
 set(_extracted_dir "Python-${PY_VERSION}")
 

CTestConfig.cmake

@@ -1,8 +1 @@
-set(CTEST_PROJECT_NAME "Python")
-set(CTEST_NIGHTLY_START_TIME "3:00:00 UTC")
 
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "open.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=CPython")
-set(CTEST_DROP_SITE_CDASH TRUE)
-set(CTEST_TEST_TIMEOUT "60")

cmake/ConfigureChecks.cmake

@@ -96,7 +96,9 @@ if(USE_SYSTEM_GDBM)
 
     if(NDBM_INCLUDE_PATH)
         set(NDBM_TAG NDBM)
+        set(NDBM_USE NDBM)
     else()
+        set(NDBM_USE GDBM_COMPAT)
         find_path(GDBM_NDBM_INCLUDE_PATH gdbm/ndbm.h)
         if(GDBM_NDBM_INCLUDE_PATH)
             set(NDBM_TAG GDBM_NDBM)
@@ -326,7 +328,11 @@ check_include_files(process.h HAVE_PROCESS_H)
 check_include_files(pthread.h HAVE_PTHREAD_H)
 check_include_files(pty.h HAVE_PTY_H)
 check_include_files(pwd.h HAVE_PWD_H)
-check_include_files("stdio.h;readline/readline.h" HAVE_READLINE_READLINE_H)
+if(USE_LIBEDIT)
+  check_include_files("stdio.h;editline/readline.h" HAVE_READLINE_READLINE_H)
+else()
+  check_include_files("stdio.h;readline/readline.h" HAVE_READLINE_READLINE_H)
+endif()
 check_include_files(semaphore.h HAVE_SEMAPHORE_H)
 check_include_files(shadow.h HAVE_SHADOW_H)
 check_include_files(signal.h HAVE_SIGNAL_H)
@@ -431,6 +437,11 @@ endif()
 find_library(HAVE_LIBNCURSES ncurses)
 find_library(HAVE_LIBNSL nsl)
 find_library(HAVE_LIBREADLINE readline)
+if(USE_LIBEDIT)
+  find_library(HAVE_LIBREADLINE edit)
+else()
+  find_library(HAVE_LIBREADLINE readline)
+endif()
 if(IS_PY3)
 find_library(HAVE_LIBSENDFILE sendfile)
 endif()
@@ -1791,7 +1802,8 @@ if(HAVE_GETHOSTBYNAME_R)
 
   # Checking gethostbyname_r with 6 args
   set(check_src ${PROJECT_BINARY_DIR}/CMakeFiles/have_gethostbyname_r_6_arg.c)
-  file(WRITE ${check_src} "int main() {
+  file(WRITE ${check_src} "#include <netdb.h>
+int main() {
     char *name;
     struct hostent *he, *res;
     char buffer[2048];
@@ -2032,7 +2044,11 @@ if(HAVE_READLINE_READLINE_H)
   cmake_push_check_state()
   set(CFG_HEADERS_SAVE ${CFG_HEADERS})
 
-  add_cond(CFG_HEADERS HAVE_READLINE_READLINE_H readline/readline.h)
+  if(USE_LIBEDIT)
+    add_cond(CFG_HEADERS HAVE_READLINE_READLINE_H editline/readline.h)
+  else()
+    add_cond(CFG_HEADERS HAVE_READLINE_READLINE_H readline/readline.h)
+  endif()
   add_cond(CMAKE_REQUIRED_LIBRARIES HAVE_LIBREADLINE ${HAVE_LIBREADLINE})
   check_symbol_exists(rl_callback_handler_install "${CFG_HEADERS}" HAVE_RL_CALLBACK)
   check_symbol_exists(rl_catch_signals            "${CFG_HEADERS}" HAVE_RL_CATCH_SIGNAL)

cmake/config-mingw/pyconfig.h

@@ -121,9 +121,11 @@ WIN32 is still required for the locale module.
 #define HAVE_SSIZE_T 1
 
 #include <float.h>
-#define Py_IS_NAN _isnan
-#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
-#define Py_IS_FINITE(X) _finite(X)
+#if PY_VERSION_HEX < 0x030B0000
+#  define Py_IS_NAN _isnan
+#  define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
+#  define Py_IS_FINITE(X) _finite(X)
+#endif
 #define copysign _copysign
 
 #include <basetsd.h>

cmake/config-unix/pyconfig.h.in

@@ -762,6 +762,9 @@
 /* Define to 1 if you have the <ncurses.h> header file. */
 #cmakedefine HAVE_NCURSES_H 1
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#cmakedefine HAVE_NETDB_H 1
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #cmakedefine HAVE_NDIR_H 1
 
@@ -1555,6 +1558,7 @@
 
 /* The size of `long', as computed by sizeof. */
 #cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+/* The size of `long', as computed by alignof. */
 #cmakedefine ALIGNOF_LONG @SIZEOF_LONG@
 
 /* The size of `long double', as computed by sizeof. */
@@ -1580,6 +1584,9 @@
 
 /* The size of `size_t', as computed by sizeof. */
 #cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
+
+
+/* The size of `size_t', as computed by alignof. */
 #cmakedefine ALIGNOF_SIZE_T @SIZEOF_SIZE_T@
 
 /* The size of `time_t', as computed by sizeof. */

cmake/extensions/CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 add_python_extension(array ${WIN32_BUILTIN} SOURCES arraymodule.c)
 add_python_extension(audioop ${WIN32_BUILTIN} REQUIRES HAVE_LIBM SOURCES audioop.c LIBRARIES ${M_LIBRARIES})
 add_python_extension(_bisect ${WIN32_BUILTIN} SOURCES _bisectmodule.c)
-add_python_extension(cmath REQUIRES HAVE_LIBM ${WIN32_BUILTIN} SOURCES _math.c cmathmodule.c LIBRARIES ${M_LIBRARIES})
+add_python_extension(cmath REQUIRES HAVE_LIBM ${WIN32_BUILTIN} SOURCES $<$<VERSION_LESS:${PY_VERSION},3.11>:_math.c> cmathmodule.c LIBRARIES ${M_LIBRARIES})
 add_python_extension(_codecs_cn ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_cn.c)
 add_python_extension(_codecs_hk ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_hk.c)
 add_python_extension(_codecs_iso2022 ${WIN32_BUILTIN} SOURCES cjkcodecs/_codecs_iso2022.c)
@@ -68,7 +68,7 @@ add_python_extension(itertools ${WIN32_BUILTIN} ${PY3_BUILTIN} SOURCES itertools
 add_python_extension(_json ${WIN32_BUILTIN} SOURCES _json.c)
 add_python_extension(_locale ${WIN32_BUILTIN} ${PY3_BUILTIN} SOURCES _localemodule.c) # access to ISO C locale support
 add_python_extension(_lsprof ${WIN32_BUILTIN} SOURCES _lsprof.c rotatingtree.c)
-add_python_extension(math ${WIN32_BUILTIN} REQUIRES HAVE_LIBM SOURCES _math.c mathmodule.c LIBRARIES ${M_LIBRARIES})
+add_python_extension(math ${WIN32_BUILTIN} REQUIRES HAVE_LIBM SOURCES $<$<VERSION_LESS:${PY_VERSION},3.11>:_math.c> mathmodule.c LIBRARIES ${M_LIBRARIES})
 add_python_extension(mmap ${WIN32_BUILTIN} SOURCES mmapmodule.c)
 add_python_extension(_multibytecodec ${WIN32_BUILTIN} SOURCES cjkcodecs/multibytecodec.c)
 add_python_extension(operator ${WIN32_BUILTIN} REQUIRES IS_PY2 SOURCES operator.c)
@@ -102,7 +102,11 @@ add_python_extension(faulthandler ALWAYS_BUILTIN REQUIRES IS_PY3 SOURCES faultha
 add_python_extension(_opcode ${WIN32_BUILTIN} REQUIRES IS_PY3 SOURCES _opcode.c)
 add_python_extension(_operator BUILTIN REQUIRES IS_PY3 SOURCES _operator.c)
 add_python_extension(_pickle ${WIN32_BUILTIN} REQUIRES IS_PY3 SOURCES _pickle.c)
-add_python_extension(_sre BUILTIN SOURCES _sre.c) # Fredrik Lundh's new regular expressions
+if(PY_VERSION VERSION_LESS "3.11")
+    add_python_extension(_sre BUILTIN SOURCES _sre.c) # Fredrik Lundh's new regular expressions
+else()
+    add_python_extension(_sre BUILTIN SOURCES _sre/sre.c) # Fredrik Lundh's new regular expressions
+endif()
 add_python_extension(_stat BUILTIN REQUIRES IS_PY3 SOURCES _stat.c) # stat.h interface
 add_python_extension(_symtable BUILTIN SOURCES symtablemodule.c)
 # Python PEP-3118 (buffer protocol) test module
@@ -711,7 +715,7 @@ endif()
 add_python_extension(${dbm_name}
     REQUIRES NDBM_TAG GDBM_LIBRARY GDBM_COMPAT_LIBRARY
     SOURCES ${dbm${PY_VERSION_MAJOR}_SOURCES}
-    DEFINITIONS HAVE_${NDBM_TAG}_H
+    DEFINITIONS HAVE_${NDBM_TAG}_H USE_${NDBM_USE}
     LIBRARIES ${GDBM_LIBRARY} ${GDBM_COMPAT_LIBRARY}
     INCLUDEDIRS ${${NDBM_TAG}_INCLUDE_PATH}
 )
@@ -758,7 +762,8 @@ add_python_extension(readline
 )
 add_python_extension(_sqlite3
     REQUIRES SQLite3_INCLUDE_DIRS SQLite3_LIBRARIES
-    SOURCES _sqlite/cache.c
+    SOURCES $<$<VERSION_LESS:${PY_VERSION},3.11>:_sqlite/cache.c>
+            $<$<VERSION_GREATER_EQUAL:${PY_VERSION},3.11>:_sqlite/blob.c>
             _sqlite/connection.c
             _sqlite/cursor.c
             _sqlite/microprotocols.c
@@ -792,9 +797,9 @@ set(_tkinter_REQUIRES TCL_LIBRARY TK_LIBRARY TCL_INCLUDE_PATH TK_INCLUDE_PATH)
 set(_tkinter_LIBRARIES ${TCL_LIBRARY} ${TK_LIBRARY})
 set(_tkinter_INCLUDEDIRS ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH})
 if(UNIX)
-  list(APPEND _tkinter_REQUIRES X11_INCLUDE_DIR X11_LIBRARIES)
-  list(APPEND _tkinter_LIBRARIES ${X11_LIBRARIES})
-  list(APPEND _tkinter_INCLUDEDIRS ${X11_INCLUDE_DIR})
+    list(APPEND _tkinter_REQUIRES X11_INCLUDE_DIR X11_LIBRARIES)
+    list(APPEND _tkinter_LIBRARIES ${X11_LIBRARIES})
+    list(APPEND _tkinter_INCLUDEDIRS ${X11_INCLUDE_DIR})
 endif()
 add_python_extension(_tkinter
     REQUIRES ${_tkinter_REQUIRES}
@@ -830,7 +835,20 @@ else()
     )
 endif()
 
-if(USE_LIBEDIT AND ENABLE_READLINE AND NOT BUILTIN_READLINE)
-    set_target_properties(extension_readline PROPERTIES
-        COMPILE_DEFINITIONS "USE_LIBEDIT")
+if(USE_LIBEDIT AND ENABLE_READLINE)
+    if(PY_VERSION VERSION_GREATER_EQUAL "3.10")
+        if(BUILTIN_READLINE)
+            set_property(GLOBAL APPEND PROPERTY extension_readline_definitions "WITH_EDITLINE")
+        else()
+            set_target_properties(extension_readline PROPERTIES
+                COMPILE_DEFINITIONS "WITH_EDITLINE")
+        endif()
+    else()
+        if(BUILTIN_READLINE)
+            set_property(GLOBAL APPEND PROPERTY extension_readline_definitions "USE_LIBEDIT")
+        else()
+            set_target_properties(extension_readline PROPERTIES
+                COMPILE_DEFINITIONS "USE_LIBEDIT")
+        endif()
+    endif()
 endif()

cmake/fficonfig.h.in

@@ -154,6 +154,8 @@
 
 /* The size of `size_t', as computed by sizeof. */
 #define SIZEOF_SIZE_T @SIZEOF_SIZE_T@
+
+/* The size of `size_t', as computed by alignof. */
 #define ALIGNOF_SIZE_T @SIZEOF_SIZE_T@
 
 /* If using the C implementation of alloca, define if you know the