Detecting Python better

Author: gershnik

.github/workflows/test.yml

@@ -235,4 +235,4 @@ jobs:
 
     - name: Build and Test
       shell: bash
-      run: cmake --build out --config $BUILD_TYPE --target run-test
+      run: cmake --build out --config $BUILD_TYPE --target test-20python

CMakeLists.txt

@@ -30,7 +30,7 @@ endif()
 
 add_subdirectory(lib)
 
-if(${Python3_Interpreter_FOUND} AND ${Python3_VERSION} VERSION_GREATER "3.8")
+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__)
@@ -85,9 +94,16 @@ int main(int argc, char** argv)
         SetConsoleOutputCP(CP_UTF8);
     #endif
 
-    #if defined(SYS_STRING_USE_PYTHON) && !defined(PYPY_VERSION)
-        Py_Initialize();
+    #if defined(SYS_STRING_USE_PYTHON)
+        #if !defined(PYPY_VERSION)
+            Py_Initialize();
+        #else
+            rpython_startup_code();
+            pypy_setup_home(nullptr, 1);
+        #endif
     #endif
+
+    
 
     return doctest::Context(argc, argv).run();
 }