More work on python coverage

Author: kunitoki

modules/yup_python/modules/yup_YupInternal_module.cpp

@@ -41,6 +41,7 @@ PYBIND11_EMBEDDED_MODULE(__yup__, m)
     py::class_<CustomOutputStream> classCustomOutputStream (m, "__stdout__");
     classCustomOutputStream.def_static ("write", [](py::object buffer) { std::cout << buffer.cast<std::string>(); });
     classCustomOutputStream.def_static ("flush", [] { std::cout << std::flush; });
+    classCustomOutputStream.def_static ("isatty", [] { return true; });
 
     struct CustomErrorStream
     {
@@ -52,6 +53,7 @@ PYBIND11_EMBEDDED_MODULE(__yup__, m)
     py::class_<CustomErrorStream> classCustomErrorStream (m, "__stderr__");
     classCustomErrorStream.def_static ("write", [](py::object buffer) { std::cerr << buffer.cast<std::string>(); });
     classCustomErrorStream.def_static ("flush", [] { std::cerr << std::flush; });
+    classCustomErrorStream.def_static ("isatty", [] { return true; });
 
     m.def ("__redirect__", []
     {

modules/yup_python/scripting/yup_ScriptEngine.cpp

@@ -105,7 +105,7 @@ std::unique_ptr<PyConfig> ScriptEngine::prepareScriptingHome (
         auto mis = MemoryInputStream (mb.getData(), mb.getSize(), false);
 
         auto zip = ZipFile (mis);
-        zip.uncompressTo (pythonFolder);
+        zip.uncompressTo (pythonFolder.getParentDirectory());
     }
 
     auto config = std::make_unique<PyConfig>();
@@ -133,10 +133,11 @@ ScriptEngine::ScriptEngine (std::unique_ptr<PyConfig> config)
 }
 
 ScriptEngine::ScriptEngine (StringArray modules, std::unique_ptr<PyConfig> config)
-    : customModules (std::move (modules))
+    : currentConfig (std::move (config))
+    , customModules (std::move (modules))
 {
     if (config)
-        pybind11::initialize_interpreter (config.get(), 0, nullptr, true);
+        pybind11::initialize_interpreter (currentConfig.get(), 0, nullptr, true);
     else
         pybind11::initialize_interpreter();
 
@@ -152,6 +153,16 @@ ScriptEngine::~ScriptEngine()
 
 //==============================================================================
 
+File ScriptEngine::getScriptingHome() const
+{
+    if (currentConfig != nullptr)
+        return String (currentConfig->home);
+
+    return {};
+}
+
+//==============================================================================
+
 Result ScriptEngine::runScript (const String& code, py::dict locals, py::dict globals)
 {
     currentScriptCode = code;

modules/yup_python/scripting/yup_ScriptEngine.h

@@ -103,6 +103,19 @@ class YUP_API ScriptEngine
 
     //==============================================================================
 
+    /** Get the scripting home directory.
+
+        When the scripting home is prepared using the prepareScriptingHome method,
+        this method will return the destination folder used to prepare the home.
+        This home folder can be used as either `PYTHONHOME` or `--prefix` when installing
+        python packages using pip.
+
+        @return The scripting home directory if present, or an empty `File` if not.
+     */
+    File getScriptingHome() const;
+
+    //==============================================================================
+
     /** Prepare a valid python home and return the config to use.
 
         @param programName The desired program name.
@@ -119,6 +132,7 @@ class YUP_API ScriptEngine
 private:
     Result runScriptInternal (const String& code, pybind11::dict locals, pybind11::dict globals);
 
+    std::unique_ptr<PyConfig> currentConfig;
     StringArray customModules;
     String currentScriptCode;
     File currentScriptFile;

python/tools/ArchivePythonStdlib.py

@@ -71,6 +71,7 @@ def make_archive(file, directory):
         "site-packages",
         "test",
         "turtledemo",
+        "EXTERNALLY-MANAGED",
         "LICENSE.txt",
     ]
 

tests/yup_python/yup_ScriptPython.cpp

@@ -0,0 +1,86 @@
+/*
+  ==============================================================================
+
+   This file is part of the YUP library.
+   Copyright (c) 2025 - [email protected]
+
+   YUP is an open source library subject to open-source licensing.
+
+   The code included in this file is provided under the terms of the ISC license
+   http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+   to use, copy, modify, and/or distribute this software for any purpose with or
+   without fee is hereby granted provided that the above copyright notice and
+   this permission notice appear in all copies.
+
+   YUP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+#include <yup_python/yup_python.h>
+
+#include <gtest/gtest.h>
+
+#include <PythonStandardLibrary.h>
+
+using namespace yup;
+
+class ScriptPythonTest : public ::testing::Test
+{
+protected:
+    static File getPytestTestFolder()
+    {
+        return File (__FILE__)
+            .getParentDirectory()
+            .getParentDirectory()
+            .getParentDirectory()
+            .getChildFile ("python")
+            .getChildFile ("tests");
+    }
+
+    void SetUp() override
+    {
+        engine = std::make_unique<ScriptEngine> (ScriptEngine::prepareScriptingHome (
+            YUPApplication::getInstance()->getApplicationName(),
+            File::getSpecialLocation (File::tempDirectory),
+            [] (const char*) -> MemoryBlock
+        {
+            return { PythonStandardLibrary_data, PythonStandardLibrary_size };
+        }));
+    }
+
+    void TearDown() override
+    {
+        // Cleanup after each test
+    }
+
+    std::unique_ptr<ScriptEngine> engine;
+};
+
+TEST_F (ScriptPythonTest, RunPythonTests)
+{
+    auto script = String (R"(
+        import importlib
+
+        package = 'pytest'
+
+        try:
+            importlib.import_module(package)
+        except ImportError:
+            import pip
+            pip.main(['install', package, '--prefix', '{{root_path}}'])
+        finally:
+            globals()[package] = importlib.import_module(package)
+
+        pytest.main(['-x', '{{test_path}}', '-vv'])
+    )")
+                      .dedentLines()
+                      .replace ("{{root_path}}", engine->getScriptingHome().getFullPathName())
+                      .replace ("{{test_path}}", getPytestTestFolder().getFullPathName());
+
+    auto result = engine->runScript (script);
+
+    EXPECT_TRUE (result.wasOk()) << "Pytest failed: " << result.getErrorMessage();
+}