Merge pull request #309 from zrax/py39_min

Drop support for Python versions before 3.7, and simplify CI matrix accordingly

Author: zrax

.github/workflows/windows-ci.yml

@@ -10,11 +10,10 @@ jobs:
           - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.13", unity: OFF, str: windows-x64-v143 }
           - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.12", unity: ON, str: windows-x64-v143 }
           - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.11", unity: ON, str: windows-x64-v143 }
-          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v143, cmake-arch: x64, arch: x64, python: "3.10", unity: ON, str: windows-x64-v143 }
-          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: Win32, arch: x86, python: 3.9, unity: ON, str: windows-x86-v142 }
-          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: x64, arch: x64, python: 3.8, unity: OFF, str: windows-x64-v142 }
+          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: x64, arch: x64, python: "3.10", unity: ON, str: windows-x64-v143 }
+          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: Win32, arch: x86, python: 3.9, unity: OFF, str: windows-x86-v142 }
+          # Python 3.7 compatibility is required by Blender 2.79
           - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: Win32, arch: x86, python: 3.7, unity: OFF, str: windows-x86-v142 }
-          - { image: windows-2022, generator: Visual Studio 17 2022, toolset: v142, cmake-arch: x64, arch: x64, python: 3.6, unity: ON, str: windows-x64-v142 }
     env:
       VCPKG_BINARY_SOURCES: 'clear'
       VCPKG_DEFAULT_HOST_TRIPLET: windows-hsplasma

Python/CMakeLists.txt

@@ -1,4 +1,4 @@
-find_package(Python3 3.2 REQUIRED COMPONENTS Interpreter Development)
+find_package(Python3 3.7 REQUIRED COMPONENTS Interpreter Development)
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
     set(CMAKE_CXX_FLAGS "-fno-strict-aliasing ${CMAKE_CXX_FLAGS}")

Python/PyPlasma.h

@@ -55,8 +55,8 @@ struct pySequenceFastRef
     PyObject* get(Py_ssize_t idx) { return PySequence_Fast_GET_ITEM(fObj, idx); }
 };
 
-#if (PY_MAJOR_VERSION < 3) || ((PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 2))
-    #error Your Python version is too old.  Only 3.2 and later are supported
+#if (PY_MAJOR_VERSION < 3) || ((PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 7))
+    #error Your Python version is too old.  Only 3.7 and later are supported
 #endif
 
 // C doesn't have boolean types until C11, which Python doesn't use
@@ -556,11 +556,6 @@ template <> inline plKeyDef pyPlasma_get(PyObject* value) { return (plKeyDef)PyL
 #define PY_METHOD_TERMINATOR { nullptr, nullptr, 0, nullptr }
 
 /* Helpers for declaring and populating the master PyTypeObject structure */
-#if (PY_MAJOR_VERSION >= 4) || ((PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION >= 4))
-    #define _TP_FINALIZE_INIT nullptr,
-#else
-    #define _TP_FINALIZE_INIT
-#endif
 
 // tp_print moved to the end, and two new vectorcall fields inserted in Python 3.8...
 // tp_print removed entirely from Python 3.9...
@@ -606,18 +601,12 @@ template <> inline plKeyDef pyPlasma_get(PyObject* value) { return (plKeyDef)PyL
         nullptr, nullptr, nullptr, nullptr, nullptr,                    \
         nullptr, nullptr, nullptr, nullptr, nullptr,                    \
         nullptr, 0,                                                     \
-        _TP_FINALIZE_INIT                                               \
+        nullptr,                                                        \
         _TP_VECTORCALL_PRINT                                            \
         _TP_WATCHED_INIT                                                \
         _TP_VERSIONS_USED                                               \
     };
 
-#if ((PY_MAJOR_VERSION > 3) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 5))
-    #define _NB_MATRIX_MULTIPLY_INIT nullptr, nullptr,
-#else
-    #define _NB_MATRIX_MULTIPLY_INIT
-#endif
-
 #define PY_PLASMA_TYPE_AS_NUMBER(pyType)                                \
     static PyNumberMethods py##pyType##_As_Number = {                   \
         nullptr, nullptr, nullptr,                                      \
@@ -628,7 +617,7 @@ template <> inline plKeyDef pyPlasma_get(PyObject* value) { return (plKeyDef)PyL
         nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,  \
         nullptr, nullptr, nullptr, nullptr,                             \
         nullptr,                                                        \
-        _NB_MATRIX_MULTIPLY_INIT                                        \
+        nullptr, nullptr,                                               \
     };
 
 #define PY_PLASMA_TYPE_AS_MAPPING(pyType)                               \

README.md

@@ -49,7 +49,7 @@ For libHSPlasmaNet
 
 For PyHSPlasma
 
-- [Python 3.2+](http://www.python.org/)
+- [Python 3.7+](http://www.python.org/)
 
 You will also need CMake and a C++ compiler with at least some C++11 support.
 The following compiler versions are currently supported (others may work,