Merge branch 'vnext'

Author: gershnik

.github/workflows/test.yml

@@ -209,4 +209,35 @@ jobs:
       shell: bash
       run: cmake --build out --config ${{env.BUILD_TYPE}} --target run-test
 
+  pythons:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [
+          "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t",
+          "pypy-3.9", "pypy-3.10", "pypy-3.11"
+        ]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      id: setup-python
+      with:
+        python-version: ${{matrix.python-version}}
 
+    - name: Configure
+      shell: bash
+      run: |
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+
+    - name: Build and Test
+      shell: bash
+      run: |
+        cmake --build out --config $BUILD_TYPE --target test-20python test-23python
+        echo Running test-20python
+        out/test/test-20python -ni -fc
+        echo Running test-23python
+        out/test/test-23python -ni -fc

CMakeLists.txt

@@ -30,7 +30,7 @@ endif()
 
 add_subdirectory(lib)
 
-if(${Python3_Interpreter_FOUND})
+if(${Python3_Interpreter_FOUND} AND ${Python3_VERSION} VERSION_GREATER_EQUAL "3.9")
 
     file(GLOB UNICODE_DATA ${CMAKE_CURRENT_LIST_DIR}/unicode/data/*.txt)
     file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)

test/test_main.cpp

@@ -73,6 +73,15 @@ JNIEnv * g_env;
 
 #endif
 
+#if defined(SYS_STRING_USE_PYTHON) && defined(PYPY_VERSION)
+
+extern "C" {
+    void rpython_startup_code(void);
+    int pypy_setup_home(char *home, int verbose);
+}
+
+#endif
+
 int main(int argc, char** argv)
 {
     #if defined(__ANDROID__)
@@ -86,8 +95,15 @@ int main(int argc, char** argv)
     #endif
 
     #if defined(SYS_STRING_USE_PYTHON)
-        Py_Initialize();
+        #if !defined(PYPY_VERSION)
+            Py_Initialize();
+        #else
+            rpython_startup_code();
+            pypy_setup_home(nullptr, 1);
+        #endif
     #endif
+
+    
 
     return doctest::Context(argc, argv).run();
 }