Avoid ifdef, align defines, fix some small nits, reduce cibw verbosity

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

.github/workflows/build.yml

@@ -330,7 +330,6 @@ jobs:
           env:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-manylinux*"
             CIBW_ENVIRONMENT_LINUX: ACLOCAL_PATH="/usr/share/aclocal" CSP_MANYLINUX="ON" CCACHE_DIR="/host/home/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="/host${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="/host${{ env.VCPKG_DOWNLOADS }}"
-            CIBW_BUILD_VERBOSITY: 3
           if: ${{ runner.os == 'Linux' }}
 
         ########
@@ -341,7 +340,6 @@ jobs:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
             CIBW_ENVIRONMENT_MACOS: CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
             CIBW_ARCHS_MACOS: arm64
-            CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-14' }}
 
         ##########

cpp/csp/python/Common.h

@@ -3,8 +3,8 @@
 
 #include <Python.h>
 
-#define IS_LT_PYTHON_3_11 (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 11) )
-#define IS_GE_PYTHON_3_13 (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 12) )
+#define IS_PRE_PYTHON_3_11 (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 11) )
+#define IS_PRE_PYTHON_3_13 (PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 13) )
 
 #define INIT_PYDATETIME if( !PyDateTimeAPI ) { PyDateTime_IMPORT; }
 

cpp/csp/python/PyNode.cpp

@@ -15,8 +15,8 @@
 #include <limits>
 #include <frameobject.h>
 
-#if !IS_LT_PYTHON_3_11
-#if IS_GE_PYTHON_3_13
+#if !IS_PRE_PYTHON_3_11
+#if !IS_PRE_PYTHON_3_13
 #    define Py_BUILD_CORE 1
 #endif
 #include <internal/pycore_code.h>
@@ -64,7 +64,7 @@ void PyNode::init( PyObjectPtr inputs, PyObjectPtr outputs )
     m_localVars = ( PyObject *** ) calloc( numInputs(), sizeof( PyObject ** ) );
 
     //printf( "Starting %s slots: %ld rank: %d\n", name(), slots, rank() );
-#if IS_LT_PYTHON_3_11
+#if IS_PRE_PYTHON_3_11
     PyCodeObject * code = ( PyCodeObject * ) pygen -> gi_code;
     Py_ssize_t numCells = PyTuple_GET_SIZE( code -> co_cellvars );
     size_t cell2argIdx = 0;
@@ -88,13 +88,7 @@ void PyNode::init( PyObjectPtr inputs, PyObjectPtr outputs )
 //PY311+ changes
 #else
     _PyInterpreterFrame * frame = ( _PyInterpreterFrame * ) pygen -> gi_iframe;
-    PyCodeObject * code;
-
-#if IS_GE_PYTHON_3_13
-    code = (PyCodeObject *)PyUnstable_InterpreterFrame_GetCode(frame);
-#else
-    code = frame -> f_code;
-#endif
+    PyCodeObject * code = PyGen_GetCode( ( PyGenObject * ) pygen );
     int localPlusIndex = 0;
     for( int stackloc = code -> co_argcount; stackloc < code -> co_nlocalsplus; ++stackloc, ++localPlusIndex )
     {

pyproject.toml

@@ -146,7 +146,7 @@ replace = 'project(csp VERSION "{new_version}")'
 ignore = []
 
 [tool.cibuildwheel]
-build = "cp39-* cp310-* cp311-* cp312-*"
+build = "cp39-* cp310-* cp311-* cp312-* cp313-*"
 test-command = "echo 'TODO'"
 test-requires = [
     "pytest",
@@ -177,7 +177,6 @@ archs = "arm64"
 [tool.cibuildwheel.windows]
 before-all = "make dependencies-win"
 before-build = "make requirements"
-
 archs = "AMD64"
 skip = "*win32 *arm_64"