Nuitka-winsvc 1.6.6__cp310-cp310-win_amd64.whl → 1.7.5__cp310-cp310-win_amd64.whl

nuitka/plugins/standard/MatplotlibPlugin.py

@@ -20,10 +20,15 @@ import os
 
 from nuitka.Options import isStandaloneMode
 from nuitka.plugins.PluginBase import NuitkaPluginBase
-from nuitka.plugins.Plugins import getActiveQtPlugin, hasActivePlugin
+from nuitka.plugins.Plugins import (
+    getActiveQtPluginBindingName,
+    hasActivePlugin,
+)
 from nuitka.utils.FileOperations import getFileContentByLine
+from nuitka.utils.Jinja2 import renderTemplateFromString
 
-# spellchecker: ignore matplotlib, scipy, scikit, matplotlibrc, matplotlibdata, mpl_toolkits, tkagg
+# spellchecker: ignore matplotlib, scipy, scikit, matplotlibrc, matplotlibdata
+# spellchecker: ignore mpl_toolkits, tkagg, MPLBACKEND
 
 
 class NuitkaPluginMatplotlib(NuitkaPluginBase):
@@ -80,7 +85,7 @@ from inspect import getsource
                 ("matplotlib_version", "__version__"),
                 (
                     "needs_matplotlibdata_env",
-                    "'MATPLOTLIBDATA' in getsource(get_data_path)",
+                    "'MATPLOTLIBDATA' in getsource(get_data_path) or 'MATPLOTLIBRC' in getsource(get_data_path)",
                 ),
             ),
         )
@@ -133,12 +138,14 @@ from inspect import getsource
             new_lines.append("backend: %s" % matplotlib_info.backend)
 
         yield self.makeIncludedGeneratedDataFile(
-            data=new_lines,
+            data="\n".join(new_lines),
             dest_path=os.path.join("matplotlib", "mpl-data", "matplotlibrc"),
             reason="updated matplotlib config file with backend to use",
         )
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         if module_name.hasNamespace("mpl_toolkits"):
             return True, "Needed by matplotlib"
 
@@ -153,20 +160,6 @@ from inspect import getsource
             ):
                 return True, "Needed for tkinter matplotlib backend"
 
-        if getActiveQtPlugin() is not None:
-            # Note, their code tries everything behind that name, the qt5 is
-            # misleading therefore, PySide will work there too.
-            if module_name in (
-                "matplotlib.backends.backend_qt5",
-                "matplotlib.backends.backend_qt5.py",
-                "matplotlib.backends.backend_qt5cairo.py",
-                "matplotlib.backend.backend_qt5.py",
-            ):
-                return True, "Needed for Qt matplotlib backend"
-
-        if module_name == "matplotlib.backends.backend_agg":
-            return True, "Needed as standard matplotlib backend"
-
     def createPreModuleLoadCode(self, module):
         """Method called when a module is being imported.
 
@@ -186,11 +179,20 @@ from inspect import getsource
             module.getFullName() == "matplotlib"
             and self._getMatplotlibInfo().needs_matplotlibdata_env
         ):
-            code = r"""
+            code = renderTemplateFromString(
+                r"""
 import os
 os.environ["MATPLOTLIBDATA"] = os.path.join(__nuitka_binary_dir, "matplotlib", "mpl-data")
-"""
+os.environ["MATPLOTLIBRC"] = os.path.join(__nuitka_binary_dir, "matplotlib", "mpl-data", "matplotlibrc")
+os.environ["MPLBACKEND"] = {{matplotlib_info.backend}}
+{% if qt_binding_name %}
+os.environ["QT_API"] = "{{qt_binding_name}}"
+{% endif %}
+""",
+                matplotlib_info=self._getMatplotlibInfo(),
+                qt_binding_name=getActiveQtPluginBindingName(),
+            )
             return (
                 code,
-                "Setting 'MATPLOTLIBDATA' environment variable for matplotlib to find package data.",
+                "Setting environment variables for 'matplotlib' to find package configuration.",
             )

nuitka/plugins/standard/MultiprocessingPlugin.py

@@ -153,10 +153,12 @@ __import__("multiprocessing.forking").forking.freeze_support()"""
             module_name,
             source_code,
             root_module.getCompileTimeFilename(),
-            "Autoenable multiprocessing freeze support",
+            "Auto enable multiprocessing freeze support",
         )
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         # Enforce recursion in to multiprocessing for accelerated mode, which
         # would normally avoid this.
         if module_name.hasNamespace("multiprocessing"):
@@ -166,18 +168,9 @@ __import__("multiprocessing.forking").forking.freeze_support()"""
         if module_name.hasNamespace("multiprocessing"):
             return "bytecode"
 
-        # TODO: Make this demotable too.
+        # TODO: Make this demoted too.
         # or module_name in( "multiprocessing-preLoad", "multiprocessing-postLoad"):
 
-    def onFrozenModuleSourceCode(self, module_name, is_package, source_code):
-        if module_name == "multiprocessing.resource_tracker":
-            source_code = source_code.replace(
-                "args += ['-c', cmd % r]",
-                "args += ['--multiprocessing-resource-tracker', str(r)]",
-            )
-
-        return source_code
-
     @staticmethod
     def getPreprocessorSymbols():
         if getModuleInclusionInfoByName("__parents_main__"):

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -58,9 +58,9 @@ class NuitkaPluginOptionsNanny(NuitkaPluginBase):
         if support_info == "ignore":
             return
 
-        message = "Using module (%s %s) with no support: %s" % (
+        message = "Using module ('%s' version %s) with no full support: %s" % (
             full_name.asString(),
-            self.getPackageVersion(full_name),
+            ".".join(str(d) for d in self.getPackageVersion(full_name)),
             description,
         )
 

nuitka/plugins/standard/PySidePyQtPlugin.py

@@ -61,7 +61,12 @@ class NuitkaPluginQtBindingsPluginBase(NuitkaPluginBase):
     warned_about = set()
 
     def __init__(self, qt_plugins, no_qt_translations):
-        self.qt_plugins = OrderedSet(x.strip().lower() for x in qt_plugins.split(","))
+        if not qt_plugins:
+            qt_plugins = ["sensible"]
+
+        qt_plugins = sum([value.split(",") for value in qt_plugins], [])
+
+        self.qt_plugins = OrderedSet(x.strip().lower() for x in qt_plugins)
         self.no_qt_translations = no_qt_translations
 
         self.web_engine_done_binaries = False
@@ -92,9 +97,9 @@ class NuitkaPluginQtBindingsPluginBase(NuitkaPluginBase):
     def addPluginCommandLineOptions(cls, group):
         group.add_option(
             "--include-qt-plugins",
-            action="store",
+            action="append",
             dest="qt_plugins",
-            default="sensible",
+            default=[],
             help="""\
 Which Qt plugins to include. These can be big with dependencies, so
 by default only the sensible ones are included, but you can also put
@@ -1052,7 +1057,9 @@ Prefix = .
                         if os.path.basename(sub_dll_filename).startswith(badword):
                             yield sub_dll_filename
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         top_package_name = module_name.getTopLevelPackageName()
 
         if isStandaloneMode():
@@ -1213,12 +1220,15 @@ The standard PySide2 is not supported before CPython <3.6. For full support: htt
             self, qt_plugins=qt_plugins, no_qt_translations=no_qt_translations
         )
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         if module_name == self.binding_name and self._getNuitkaPatchLevel() < 1:
             return True, "Need to monkey patch PySide2 for abstract methods."
 
         return NuitkaPluginQtBindingsPluginBase.onModuleEncounter(
             self,
+            using_module_name=using_module_name,
             module_name=module_name,
             module_filename=module_filename,
             module_kind=module_kind,
@@ -1405,7 +1415,9 @@ class NuitkaPluginNoQt(NuitkaPluginBase):
 
     warned_about = set()
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         top_package_name = module_name.getTopLevelPackageName()
 
         if isStandaloneMode():

nuitka/plugins/standard/PywebViewPlugin.py

@@ -45,7 +45,9 @@ class NuitkaPluginPywebview(NuitkaPluginBase):
         """
         return isStandaloneMode()
 
-    def onModuleEncounter(self, module_name, module_filename, module_kind):
+    def onModuleEncounter(
+        self, using_module_name, module_name, module_filename, module_kind
+    ):
         # Make sure webview platforms are included as needed.
         if module_name.isBelowNamespace("webview.platforms"):
             if isWin32Windows():
@@ -63,7 +65,7 @@ class NuitkaPluginPywebview(NuitkaPluginBase):
             elif getActiveQtPlugin() is not None:
                 result = module_name = "webview.platforms.qt"
                 reason = (
-                    "Platforms package of webview used due to '%s'."
+                    "Platforms package of webview used due to '%s' plugin being active."
                     % getActiveQtPlugin()
                 )
             else:

nuitka/plugins/standard/TkinterPlugin.py

@@ -61,6 +61,9 @@ class NuitkaPluginTkinter(NuitkaPluginBase):
     # Automatically suppress detectors for any other toolkit
     plugin_gui_toolkit = True
 
+    # Only used in control tags
+    binding_name = "tkinter"
+
     def __init__(self, tcl_library_dir, tk_library_dir):
         self.tcl_library_dir = tcl_library_dir
         self.tk_library_dir = tk_library_dir

nuitka/plugins/standard/TransformersPlugin.py

@@ -249,4 +249,14 @@ class NuitkaPluginTransformers(NuitkaPluginBase):
                 info_name="import_structure_for_%s"
                 % full_name.asString().replace(".", "_"),
             ):
-                yield full_name.getChildNamed(sub_module_name)
+                sub_module_name = full_name.getChildNamed(sub_module_name)
+
+                if (
+                    sub_module_name == "transformers.testing_utils"
+                    and not self.evaluateCondition(
+                        full_name="transformers", condition="use_pytest"
+                    )
+                ):
+                    continue
+
+                yield sub_module_name

nuitka/plugins/standard/TrioPlugin.py

@@ -15,75 +15,15 @@
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
 #
-"""Trio plugin module."""
-
+""" Deprecated trio plugin.
+"""
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
-_trio_patches = {
-    "trio._core._ki": (
-        """\
-enable_ki_protection = _ki_protection_decorator(True)  # type: Callable[[F], F]
-enable_ki_protection.__name__ = "enable_ki_protection"
-
-disable_ki_protection = _ki_protection_decorator(False)  # type: Callable[[F], F]
-disable_ki_protection.__name__ = "disable_ki_protection"
-""",
-        """\
-def enable_ki_protection(fn):
-    return fn
-
-def disable_ki_protection(fn):
-    return fn
-""",
-    ),
-    "trio._core._run": (
-        "coro.cr_frame.f_locals.setdefault(LOCALS_KEY_KI_PROTECTION_ENABLED, system_task)",
-        "# coro.cr_frame.f_locals.setdefault(LOCALS_KEY_KI_PROTECTION_ENABLED, system_task)",
-    ),
-}
-
 
 class NuitkaPluginTrio(NuitkaPluginBase):
-    """Plugin for compatibility with Trio.
-
-    The only incompatibility in Trio is the way it handles KeyboardInterrupt exceptions (ctrl+C):
-
-    https://github.com/Nuitka/Nuitka/issues/561
-    https://github.com/python-trio/trio/issues/1752
-
-    It does this to ensure that Trio's internal data structures stay consistent and that the
-    `finally` blocks in suspended coroutines are all run:
-
-    https://vorpus.org/blog/control-c-handling-in-python-and-trio/
-
-    So, be warned, when this plugin is enabled, your Trio code may not behave as expected when the
-    user hits CTRL+C. One option to cope with this is to run your Trio code in a separate thread,
-    listen for it in the main thread (with a try/except block), then notify the Trio thread to
-    shutdown (e.g. with `trio_token.run_sync_soon(cancel_scope.cancel())`).
-
-    """
-
     plugin_name = "trio"
-    plugin_desc = "Required for 'trio' package."
-
-    # TODO: Change this to Yaml configuration.
-
-    def __init__(self):
-        self.shown_warning = False
-
-    def onModuleSourceCode(self, module_name, source_code):
-        if module_name not in _trio_patches:
-            return
-
-        if not self.shown_warning:
-            self.info("Disabling careful handling of KeyboardInterrupt in Trio")
-            self.shown_warning = True
-
-        code_before, code_after = _trio_patches[module_name]
-
-        if code_before not in source_code:
-            self.sysexit(
-                "Could not find code to patch in " + module_name + ":\n" + code_before
-            )
+    plugin_desc = "Deprecated, was once required by the 'trio' package"
 
-        return source_code.replace(code_before, code_after)
+    @classmethod
+    def isDeprecated(cls):
+        return True