Update version of python, add more coverage to macos, trying to solve issue in Python 3.13.

Author: viferga

.github/workflows/macos-test.yml

@@ -17,11 +17,12 @@ concurrency:
 jobs:
   macos-test:
     name: MacOS Clang Test
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
+        os: [macos-13, macos-14, macos-15]
         options: [
           {build: debug, sanitizer: without-sanitizer},
           {build: debug, sanitizer: address-sanitizer},

source/loaders/py_loader/source/py_loader_impl.c

@@ -45,6 +45,13 @@
 
 #include <Python.h>
 
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13
+	#ifndef Py_BUILD_CORE
+		#define Py_BUILD_CORE
+	#endif
+	#include <internal/pycore_dict.h>
+#endif
+
 #define PY_LOADER_IMPL_FUNCTION_TYPE_INVOKE_FUNC "__py_loader_impl_function_type_invoke__"
 #define PY_LOADER_IMPL_FINALIZER_FUNC			 "__py_loader_impl_finalizer__"
 
@@ -287,7 +294,10 @@ static PyTypeObject py_loader_impl_dict_type = {
 	0,										   /* tp_finalize */
 	0,										   /* tp_vectorcall */
 #if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12
-	0 /* tp_watched */
+	0, /* tp_watched */
+#endif
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13
+	0, /* tp_versions_used */
 #endif
 };
 

tools/metacall-environment.sh

@@ -177,8 +177,10 @@ sub_python(){
 		brew install pyenv openssl
 		export PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig
 		export PYTHON_CONFIGURE_OPTS="--enable-shared"
-		pyenv install 3.11.1
-		pyenv global 3.11.1
+		PYTHON_VERSION_SMALL="3.13"
+		PYTHON_VERSION="${PYTHON_VERSION_SMALL}.0"
+		pyenv install ${PYTHON_VERSION}
+		pyenv global ${PYTHON_VERSION}
 		pyenv rehash
 		mkdir -p "$ROOT_DIR/build"
 		CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt"
@@ -187,11 +189,11 @@ sub_python(){
 		echo eval "$(pyenv init -)" >> $ENV_FILE
 		. $ENV_FILE
 
-		echo "-DPython3_INCLUDE_DIRS=$HOME/.pyenv/versions/3.11.1/include/python3.11" >> $CMAKE_CONFIG_PATH
-		echo "-DPython3_LIBRARY=$HOME/.pyenv/versions/3.11.1/lib/libpython3.11.dylib" >> $CMAKE_CONFIG_PATH
-		echo "-DPython3_EXECUTABLE=$HOME/.pyenv/versions/3.11.1/bin/python3.11" >> $CMAKE_CONFIG_PATH
-		echo "-DPython3_ROOT=$HOME/.pyenv/versions/3.11.1" >> $CMAKE_CONFIG_PATH
-		echo "-DPython3_VERSION=3.11.1" >> $CMAKE_CONFIG_PATH
+		echo "-DPython3_INCLUDE_DIRS=$HOME/.pyenv/versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION_SMALL}" >> $CMAKE_CONFIG_PATH
+		echo "-DPython3_LIBRARY=$HOME/.pyenv/versions/${PYTHON_VERSION}/lib/libpython${PYTHON_VERSION_SMALL}.dylib" >> $CMAKE_CONFIG_PATH
+		echo "-DPython3_EXECUTABLE=$HOME/.pyenv/versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION_SMALL}" >> $CMAKE_CONFIG_PATH
+		echo "-DPython3_ROOT=$HOME/.pyenv/versions/${PYTHON_VERSION}" >> $CMAKE_CONFIG_PATH
+		echo "-DPython3_VERSION=${PYTHON_VERSION}" >> $CMAKE_CONFIG_PATH
 		echo "-DPython3_FIND_FRAMEWORK=NEVER" >> $CMAKE_CONFIG_PATH
 
 		pip3 install requests