Nuitka-winsvc 1.8.6__cp312-cp312-win_amd64.whl → 1.9.3__cp312-cp312-win_amd64.whl

nuitka/plugins/standard/PmwPlugin.py

@@ -98,7 +98,7 @@ Should 'Pmw.Blt' not be included, Default is to include it.""",
 Should 'Pmw.Color' not be included, Default is to include it.""",
         )
 
-    def onModuleSourceCode(self, module_name, source_code):
+    def onModuleSourceCode(self, module_name, source_filename, source_code):
         if module_name == "Pmw":
             pmw_path = self.locateModule(module_name=module_name)
 

nuitka/plugins/standard/PySidePyQtPlugin.py

@@ -39,18 +39,20 @@ from nuitka.plugins.Plugins import (
 )
 from nuitka.PythonFlavors import isAnacondaPython
 from nuitka.PythonVersions import python_version
+from nuitka.utils.Distributions import (
+    getDistributionFromModuleName,
+    getDistributionInstallerName,
+    getDistributionName,
+)
 from nuitka.utils.FileOperations import getFileList, listDir
 from nuitka.utils.ModuleNames import ModuleName
-from nuitka.utils.Utils import (
-    getArchitecture,
-    isDebianBasedLinux,
-    isLinux,
-    isMacOS,
-    isWin32Windows,
-)
+from nuitka.utils.Utils import getArchitecture, isMacOS, isWin32Windows
 
 
 class NuitkaPluginQtBindingsPluginBase(NuitkaPluginBase):
+    # We are a bit detail rich and caching a bunch,
+    # pylint: disable=too-many-instance-attributes
+
     # Automatically suppress detectors for any other toolkit
     plugin_gui_toolkit = True
 
@@ -60,6 +62,17 @@ class NuitkaPluginQtBindingsPluginBase(NuitkaPluginBase):
     warned_about = set()
 
     def __init__(self, include_qt_plugins, noinclude_qt_plugins, no_qt_translations):
+        self.distribution = getDistributionFromModuleName(self.binding_name)
+
+        if self.distribution is None:
+            self.sysexit(
+                "Error, failed to locate the %s installation." % self.binding_name
+            )
+
+        self.distribution_name = getDistributionName(self.distribution)
+
+        self.installer_name = getDistributionInstallerName(self.distribution_name)
+
         # Qt plugin directories found.
         self.qt_plugins_dirs = None
 
@@ -199,6 +212,8 @@ of files that you may not want to be included.""",
         return "."
 
     def _getSensiblePlugins(self):
+        # spell-checker: ignore imageformats,iconengines,mediaservice,printsupport
+        # spell-checker: ignore platformthemes,egldeviceintegrations,xcbglintegrations
         return OrderedSet(
             tuple(
                 family
@@ -390,7 +405,8 @@ import %(binding_name)s.QtCore
     def _getQmlFileList(self, dlls):
         qml_plugin_dir = self._getQmlDirectory()
 
-        # List all file types of the QML plugin folder that are data files and not DLLs.
+        # List all file types of the QML plugin folder that are data files and
+        # not DLLs, spell-checker: ignore qmlc,qmltypes,metainfo,qmldir
         datafile_suffixes = (
             ".qml",
             ".qmlc",
@@ -435,6 +451,7 @@ import %(binding_name)s.QtCore
                         self.getQtPluginTargetPath(),
                         filename_relative,
                     ),
+                    module_name=self.binding_package_name,
                     package_name=self.binding_package_name,
                     reason="qt plugin",
                 )
@@ -864,6 +881,7 @@ Prefix = .
                     dest_path=os.path.normpath(
                         os.path.join(self._getWebEngineTargetDir(), filename_relative)
                     ),
+                    module_name=full_name,
                     package_name=full_name,
                     reason="needed by '%s'" % full_name.asString(),
                 )
@@ -877,17 +895,6 @@ Prefix = .
 
         self.web_engine_done_binaries = True  # prevent multiple copies
 
-    def decideAllowOutsideDependencies(self, module_name):
-        if isLinux() and module_name.hasNamespace(self.binding_name):
-            if isDebianBasedLinux():
-                module_filename = self.locateModule(self.binding_name)
-
-                return "dist-packages" in module_filename.split("/")
-            else:
-                return False
-
-        return None
-
     def getQtPluginTargetPath(self):
         if self.binding_name == "PyQt6":
             return os.path.join(self.binding_name, "Qt6", "plugins")
@@ -935,10 +942,13 @@ Prefix = .
                 count = 0
                 for filename in qt_bin_files:
                     basename = os.path.basename(filename).lower()
+                    # spell-checker: ignore libeay32,ssleay32
+
                     if basename in ("libeay32.dll", "ssleay32.dll"):
                         yield self.makeDllEntryPoint(
                             source_path=filename,
                             dest_path=basename,
+                            module_name=full_name,
                             package_name=full_name,
                             reason="needed by '%s'" % full_name.asString(),
                         )
@@ -963,6 +973,7 @@ Prefix = .
                             qml_target_dir,
                             filename_relative,
                         ),
+                        module_name=full_name,
                         package_name=full_name,
                         reason="Qt QML plugin DLL",
                     )
@@ -980,6 +991,7 @@ Prefix = .
                             yield self.makeDllEntryPoint(
                                 source_path=filename,
                                 dest_path=basename,
+                                module_name=full_name,
                                 package_name=full_name,
                                 reason="needed by OpenGL for '%s'"
                                 % full_name.asString(),
@@ -1008,6 +1020,7 @@ Prefix = .
                     )
 
                 # Manually loaded DLLs by Qt5.
+                # spell-checker: ignore libcrypto
                 for dll_basename in ("libssl-1_1", "libcrypto-1_1"):
                     dll_filename = dll_basename + arch_suffix + ".dll"
 
@@ -1018,6 +1031,7 @@ Prefix = .
                             yield self.makeDllEntryPoint(
                                 source_path=candidate,
                                 dest_path=dll_filename,
+                                module_name=full_name,
                                 package_name=full_name,
                                 reason="needed by '%s'" % full_name.asString(),
                             )
@@ -1030,6 +1044,7 @@ Prefix = .
                 yield self.makeDllEntryPoint(
                     source_path=dll_path,
                     dest_path=os.path.basename(dll_path),
+                    module_name=full_name,
                     package_name=full_name,
                     reason="needed by '%s'" % full_name.asString(),
                 )
@@ -1039,6 +1054,7 @@ Prefix = .
                 yield self.makeDllEntryPoint(
                     source_path=dll_path,
                     dest_path=os.path.basename(dll_path),
+                    module_name=full_name,
                     package_name=full_name,
                     reason="needed by '%s'" % full_name.asString(),
                 )
@@ -1116,8 +1132,9 @@ behavior with the uncompiled code."""
             module_set=module_set, plugin_binding_name=self.binding_name
         )
 
-    def onModuleSourceCode(self, module_name, source_code):
+    def onModuleSourceCode(self, module_name, source_filename, source_code):
         """Third party packages that make binding selections."""
+        # spell-checker: ignore pyqtgraph
         if module_name.hasNamespace("pyqtgraph"):
             # TODO: Add a mechanism to force all variable references of a name to something
             # during tree building, that would cover all uses in a nicer way.

nuitka/plugins/standard/TkinterPlugin.py

@@ -22,7 +22,7 @@ import sys
 
 from nuitka.Options import isStandaloneMode, shallCreateAppBundle
 from nuitka.plugins.PluginBase import NuitkaPluginBase
-from nuitka.PythonVersions import getSystemPrefixPath
+from nuitka.PythonVersions import getSystemPrefixPath, getTkInterVersion
 from nuitka.utils.FileOperations import listDllFilesFromDirectory, relpath
 from nuitka.utils.Utils import isMacOS, isWin32Windows
 
@@ -68,7 +68,18 @@ class NuitkaPluginTkinter(NuitkaPluginBase):
         self.tcl_library_dir = tcl_library_dir
         self.tk_library_dir = tk_library_dir
 
-        self.files_copied = False  # ensure one-time action
+        # ensure one-time action, we deal with two names for the execution, yet we
+        # only want to do it once.
+        self.files_copied = False
+
+        self.tk_inter_version = getTkInterVersion()
+
+        if self.tk_inter_version is None:
+            self.sysexit("Error, it seems tk-inter is not installed.")
+
+        # Only ever saw these 2 in use.
+        assert self.tk_inter_version in ("8.5", "8.6"), self.tk_inter_version
+
         return None
 
     @classmethod
@@ -153,46 +164,44 @@ The Tcl library dir. See comments for Tk library dir.""",
             tags="tcl",
         )
 
-    @staticmethod
-    def _getTclCandidatePaths():
+    def _getTclCandidatePaths(self):
         # Check typical locations of the dirs
         yield os.environ.get("TCL_LIBRARY")
 
+        # Inside the Python install, esp. on Windows.
         for sys_prefix_path in (sys.prefix, getSystemPrefixPath()):
-            yield os.path.join(sys_prefix_path, "tcl", "tcl8.5")
-            yield os.path.join(sys_prefix_path, "tcl", "tcl8.6")
-            yield os.path.join(sys_prefix_path, "lib", "tcl8.5")
-            yield os.path.join(sys_prefix_path, "lib", "tcl8.6")
+            yield os.path.join(sys_prefix_path, "tcl", "tcl%s" % self.tk_inter_version)
+            yield os.path.join(sys_prefix_path, "lib", "tcl%s" % self.tk_inter_version)
+
             # Newer Anaconda.
-            yield os.path.join(sys_prefix_path, "Library", "lib", "tcl8.6")
+            yield os.path.join(
+                sys_prefix_path, "Library", "lib", "tcl%s" % self.tk_inter_version
+            )
 
+        # System installs on non-Windows
         if not isWin32Windows():
-            yield "/usr/share/tcltk/tcl8.6"
-            yield "/usr/share/tcltk/tcl8.5"
-            yield "/usr/share/tcl8.6"
-            yield "/usr/share/tcl8.5"
-            yield "/usr/lib64/tcl/tcl8.5"
-            yield "/usr/lib64/tcl/tcl8.6"
+            yield "/usr/share/tcltk/tcl%s" % self.tk_inter_version
+            yield "/usr/share/tcl%s" % self.tk_inter_version
+            yield "/usr/lib64/tcl/tcl%s" % self.tk_inter_version
+            yield "/usr/lib/tcl%s" % self.tk_inter_version
 
-    @staticmethod
-    def _getTkCandidatePaths():
+    def _getTkCandidatePaths(self):
         yield os.environ.get("TK_LIBRARY")
 
         for sys_prefix_path in (sys.prefix, getSystemPrefixPath()):
-            yield os.path.join(sys_prefix_path, "tcl", "tk8.5")
-            yield os.path.join(sys_prefix_path, "tcl", "tk8.6")
-            yield os.path.join(sys_prefix_path, "lib", "tk8.5")
-            yield os.path.join(sys_prefix_path, "lib", "tk8.6")
+            yield os.path.join(sys_prefix_path, "tcl", "tk%s" % self.tk_inter_version)
+            yield os.path.join(sys_prefix_path, "lib", "tk%s" % self.tk_inter_version)
+
             # Newer Anaconda.
-            yield os.path.join(sys_prefix_path, "Library", "lib", "tk8.6")
+            yield os.path.join(
+                sys_prefix_path, "Library", "lib", "tk%s" % self.tk_inter_version
+            )
 
         if not isWin32Windows():
-            yield "/usr/share/tcltk/tk8.6"
-            yield "/usr/share/tcltk/tk8.5"
-            yield "/usr/share/tk8.6"
-            yield "/usr/share/tk8.5"
-            yield "/usr/lib64/tcl/tk8.5"
-            yield "/usr/lib64/tcl/tk8.6"
+            yield "/usr/share/tcltk/tk%s" % self.tk_inter_version
+            yield "/usr/share/tk%s" % self.tk_inter_version
+            yield "/usr/lib64/tcl/tk%s" % self.tk_inter_version
+            yield "/usr/lib/tk%s" % self.tk_inter_version
 
     def considerDataFiles(self, module):
         """Provide TCL libraries to the dist folder.
@@ -220,7 +229,9 @@ The Tcl library dir. See comments for Tk library dir.""",
         tcl_library_dir = self.tcl_library_dir
         if tcl_library_dir is None:
             for tcl_library_dir in self._getTclCandidatePaths():
-                if tcl_library_dir is not None and os.path.exists(tcl_library_dir):
+                if tcl_library_dir is not None and os.path.exists(
+                    os.path.join(tcl_library_dir, "init.tcl")
+                ):
                     break
 
         if tcl_library_dir is None or not os.path.exists(tcl_library_dir):
@@ -233,7 +244,9 @@ that works, report a bug so it can be added to Nuitka."""
         tk_library_dir = self.tk_library_dir
         if tk_library_dir is None:
             for tk_library_dir in self._getTkCandidatePaths():
-                if tk_library_dir is not None and os.path.exists(tk_library_dir):
+                if tk_library_dir is not None and os.path.exists(
+                    os.path.join(tk_library_dir, "dialog.tcl")
+                ):
                     break
 
         if tk_library_dir is None or not os.path.exists(tk_library_dir):
@@ -287,6 +300,7 @@ that works, report a bug."""
                 yield self.makeDllEntryPoint(
                     source_path=filename,
                     dest_path=os.path.join("tkinterdnd2", dest_path),
+                    module_name="tkinterdnd2",
                     package_name="tkinterdnd2",
                     reason="tkinterdnd2 package DLL",
                 )

nuitka/plugins/standard/TransformersPlugin.py

@@ -35,6 +35,7 @@ class NuitkaPluginTransformers(NuitkaPluginBase):
     # Found via grep -re "_import_structure = {"
     _import_structure_modules = (
         "transformers",
+        "transformers.integrations",
         "transformers.generation",
         "transformers.models.albert",
         "transformers.models.align",
@@ -245,7 +246,8 @@ class NuitkaPluginTransformers(NuitkaPluginBase):
         if full_name in self._import_structure_modules:
             for sub_module_name in self.queryRuntimeInformationSingle(
                 setup_codes="import %s" % full_name.asString(),
-                value="list(%s._import_structure.keys())" % full_name.asString(),
+                value="list(getattr(%(module_name)s, '_import_structure', {}).keys())"
+                % {"module_name": full_name.asString()},
                 info_name="import_structure_for_%s"
                 % full_name.asString().replace(".", "_"),
             ):