Nuitka-winsvc 2.5.1__cp311-cp311-win_amd64.whl → 2.5.6__cp311-cp311-win_amd64.whl

nuitka/plugins/Plugins.py

@@ -260,6 +260,16 @@ Error, unknown plug-in '%s' in wrong case referenced, use '%s' instead."""
     return plugin_name2plugin_classes[plugin_name][0]
 
 
+def hasPluginName(plugin_name):
+    # First, load plugin classes, to know what we are talking about.
+    loadPlugins()
+
+    # Backward compatibility.
+    plugin_name = Options.getPluginNameConsideringRenames(plugin_name)
+
+    return plugin_name in plugin_name2plugin_classes
+
+
 def _addPluginClass(plugin_class, detector):
     plugin_name = plugin_class.plugin_name
 

nuitka/plugins/standard/DllFilesPlugin.py

@@ -41,6 +41,72 @@ class NuitkaPluginDllFiles(NuitkaYamlPluginBase):
     def isRelevant():
         return isStandaloneMode()
 
+    def _handleDllConfigBySources(self, dll_config, full_name, dest_path):
+        # The "when" is at that level too for these.
+        if not self.evaluateCondition(
+            full_name=full_name, condition=dll_config.get("when", "True")
+        ):
+            return
+
+        config_name = "module '%s' DLL config" % full_name
+
+        source_paths = []
+
+        for source_path in dll_config.get("source_paths", ()):
+            value = self.evaluateExpressionOrConstant(
+                full_name=full_name,
+                expression=source_path,
+                config_name=config_name,
+                extra_context=None,
+                single_value=False,
+            )
+
+            if type(value) is str:
+                source_paths.append(value)
+            else:
+                source_paths.extend(value)
+
+        dest_names = []
+
+        for dest_name in dll_config.get("dest_names", ()):
+            value = self.evaluateExpressionOrConstant(
+                full_name=full_name,
+                expression=dest_name,
+                config_name=config_name,
+                extra_context=None,
+                single_value=False,
+            )
+
+            if type(value) is str:
+                dest_names.append(value)
+            else:
+                dest_names.extend(value)
+
+        assert len(source_paths) == len(dest_names), (source_paths, dest_names)
+
+        module_filename = self.locateModule(full_name)
+
+        if os.path.isdir(module_filename):
+            if dest_path is None:
+                dest_path = full_name.asPath()
+        else:
+            if dest_path is None:
+                dest_path = os.path.join(full_name.asPath(), "..")
+
+        for source_path, dest_name in zip(source_paths, dest_names):
+            yield self.makeDllEntryPoint(
+                source_path=source_path,
+                dest_path=os.path.normpath(
+                    os.path.join(
+                        dest_path,
+                        dest_name,
+                    )
+                ),
+                module_name=full_name,
+                package_name=full_name,
+                reason="Yaml config of '%s'" % full_name.asString(),
+            )
+
     def _handleDllConfigFromFilenames(self, dll_config, full_name, dest_path):
         # A lot of details here, pylint: disable=too-many-locals
 
@@ -159,7 +225,7 @@ class NuitkaPluginDllFiles(NuitkaYamlPluginBase):
         dest_path = os.path.normpath(dest_path)
 
         if executable:
-            yield self.makeExeEntryPoint(
+            return self.makeExeEntryPoint(
                 source_path=filename,
                 dest_path=dest_path,
                 module_name=full_name,
@@ -167,7 +233,7 @@ class NuitkaPluginDllFiles(NuitkaYamlPluginBase):
                 reason="Yaml config of '%s'" % full_name.asString(),
             )
         else:
-            yield self.makeDllEntryPoint(
+            return self.makeDllEntryPoint(
                 source_path=filename,
                 dest_path=dest_path,
                 module_name=full_name,
@@ -217,6 +283,16 @@ conditions are missing, or this version of the module needs treatment added."""
 
         found = False
 
+        if "from_sources" in dll_config:
+            for result in self._handleDllConfigBySources(
+                dll_config=dll_config.get("from_sources"),
+                full_name=full_name,
+                dest_path=dest_path,
+            ):
+                yield result
+
+            found = True
+
         if "by_code" in dll_config:
             for result in self._handleDllConfigByCode(
                 dll_config=dll_config.get("by_code"),

nuitka/plugins/standard/ImplicitImports.py

@@ -317,8 +317,6 @@ class NuitkaPluginImplicitImports(NuitkaYamlPluginBase):
         for config_package_dir in config.get("package-dirs", ()):
             yield os.path.normpath(os.path.join(package_dir, "..", config_package_dir))
 
-            yield package_dir
-
         for config_package_name in config.get("package-paths", ()):
             module_filename = self.locateModule(config_package_name)
 
@@ -543,6 +541,10 @@ __file__ = (__nuitka_binary_dir + '%ssite.py') if '__nuitka_binary_dir' in dict(
                 ):
                     code = "\n".join(entry.get("pre-import-code"))
 
+                    # TODO: Add a description to the Yaml file.
+                    yield code, """\
+According to Yaml 'pre-import-code' configuration."""
+
         for entry in self.config.get(full_name, section="import-hacks"):
             if "force-environment-variables" in entry:
                 if self.evaluateCondition(

nuitka/plugins/standard/MatplotlibPlugin.py

@@ -99,7 +99,7 @@ https://matplotlib.org/stable/users/installing/environment_variables_faq.html#en
 
         if info.backend == "QtAgg" and getActiveQtPlugin() is None:
             self.sysexit(
-                "Error, cannot use 'QtAgg' with not plugin for Qt binding active."
+                "Error, cannot use 'QtAgg' without a plugin for Qt binding active, use e.g. '--enable-plugin=pyside6'."
             )
 
         return info

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -81,15 +81,16 @@ Error, package '%s' requires '--macos-create-app-bundle' to be used or else it c
         elif macos_bundle == "no":
             pass
         elif macos_bundle == "recommend":
-            self.info(
-                """\
+            if not shallCreateAppBundle():
+                self.info(
+                    """\
 Note, when using '%s', consider using '--macos-create-app-bundle' option. \
 Otherwise high resolution will not be available and a terminal window will \
 open. However for debugging, terminal output is the easiest way to see \
 informative traceback and error information, so launch it from there if \
 possible."""
-                % full_name
-            )
+                    % full_name
+                )
         else:
             self.sysexitIllegalOptionValue(full_name, "macos_bundle", macos_bundle)
 

nuitka/plugins/standard/TkinterPlugin.py

@@ -66,14 +66,14 @@ class NuitkaPluginTkinter(NuitkaPluginBase):
         self.tcl_library_dir = tcl_library_dir
         self.tk_library_dir = tk_library_dir
 
-        # ensure one-time action, we deal with two names for the execution, yet we
-        # only want to do it once.
+        # ensure one-time action, we deal with several 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.")
+            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
@@ -164,6 +164,16 @@ The Tcl library dir. See comments for Tk library dir.""",
                 )
             )
 
+            # Homebrew is compiled to think it's 8.6, but it might actually
+            # be the version 9.
+            yield os.path.normpath(
+                os.path.join(
+                    _getHomebrewPrefix(self),
+                    "lib",
+                    "tcl9",
+                )
+            )
+
     def _getTkCandidatePaths(self):
         yield os.getenv("TK_LIBRARY")
 
@@ -191,6 +201,16 @@ The Tcl library dir. See comments for Tk library dir.""",
                 )
             )
 
+            # Homebrew is compiled to think it's 8.6, but it might actually
+            # be the version 9.
+            yield os.path.normpath(
+                os.path.join(
+                    _getHomebrewPrefix(self),
+                    "lib",
+                    "tk9.0",
+                )
+            )
+
     def considerDataFiles(self, module):
         """Provide TCL libraries to the dist folder.
 

nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -1033,6 +1033,11 @@
       replacements_plain:
         '__version__ = get_distribution(__name__).version': 'raise DistributionNotFound'
 
+- module-name: 'debian' # checksum: a633a55a
+  data-files:
+    - include-metadata:
+        - 'debian'
+
 - module-name: 'deepspeed' # checksum: 5af29274
   anti-bloat:
     - description: 'remove setuptools usage via triton'
@@ -1237,6 +1242,11 @@
         - '.IN.*'
         - '.CH.A'
 
+- module-name: 'docling_core' # checksum: 690d0f0d
+  data-files:
+    - include-metadata:
+        - 'docling-core'
+
 - module-name: 'dotenv' # checksum: c120bb25
   anti-bloat:
     - description: 'remove IPython reference'
@@ -2224,6 +2234,12 @@
         prefixes:
           - '_cext'
 
+- module-name: 'lab_lamma' # checksum: 2c54cdc3
+  implicit-imports:
+    - depends:
+        - 'vipm_io'
+        - 'keyring'
+
 - module-name: 'langchain.chains.llm_summarization_checker' # checksum: 9ac5f4e6
   data-files:
     - patterns:
@@ -2301,6 +2317,13 @@
     - patterns:
         - 'version.info'
 
+- module-name: 'litellm' # checksum: fa10c772
+  data-files:
+    - patterns:
+        - '*.json'
+    - dirs:
+        - 'llms/tokenizers'
+
 - module-name: 'llama_cpp' # checksum: 34acaa89
   dlls:
     - from_filenames:
@@ -3751,6 +3774,11 @@
         '"IPython" in sys.modules': 'False'
       when: 'not use_ipython'
 
+- module-name: 'pdfminer' # checksum: a3629ef7
+  data-files:
+    - dirs:
+        - 'cmap'
+
 - module-name: 'pendulum' # checksum: 71704ba2
   data-files:
     - empty_dir_structures:
@@ -4400,7 +4428,7 @@
     - patterns:
         - 'version.json'
 
-- module-name: 'pypdfium2_raw' # checksum: 2bdc1095
+- module-name: 'pypdfium2_raw' # checksum: 2df23eb6
   data-files:
     - patterns:
         - 'version.json'
@@ -4409,6 +4437,7 @@
     - from_filenames:
         prefixes:
           - 'pdfium'
+          - 'libpdfium'
 
 - module-name: 'pyphen' # checksum: aa53bb0a
   data-files:
@@ -5026,18 +5055,38 @@
           - 'librlottie'
       when: 'not win32'
 
-- module-name: 'rtree' # checksum: 7b6be18
+- module-name: 'rtree.finder' # checksum: 312489cf
+  variables:
+    setup_code:
+      - 'import ctypes, os, rtree.finder'
+      - 'orig_LoadLibrary = ctypes.cdll.LoadLibrary'
+      - 'val = []'
+      - 'def my_LoadLibrary(filename):'
+      - '    val.append(filename)'
+      - '    return orig_LoadLibrary(filename)'
+      - 'ctypes.cdll.LoadLibrary = my_LoadLibrary'
+      - 'rtree.finder.load()'
+    declarations:
+      'rtree_dll_source_paths': 'val[0]'
+      'rtree_dll_names': '"libspatialindex" + (".dll" if os.name=="nt" else ".so")'
   dlls:
-    - from_filenames:
-        relative_path: 'lib'
-        prefixes:
-          - 'spatialindex'
+    - from_sources:
+        'source_paths':
+          - 'get_variable("rtree_dll_source_paths")'
+        'dest_names':
+          - 'get_variable("rtree_dll_names")'
+  anti-bloat:
+    - description: 'workaround libspatialindex DLL name changes for arches'
+      replacements_plain:
+        'str(path / lib_name)': 'str(path)'
+        'os.environ["PATH"] = ";".join([str(path), oldenv])': 'os.environ["PATH"] = ";".join([str(path.parent), oldenv])'
       when: 'win32'
-    - from_filenames:
-        relative_path: 'lib'
-        prefixes:
-          - 'libspatialindex'
-      when: 'not win32'
+
+  implicit-imports:
+    - pre-import-code:
+        - |
+          import os
+          os.environ["SPATIALINDEX_C_LIBRARY"] = os.path.join(os.path.dirname(__file__), "libspatialindex" + (".dll" if os.name=="nt" else ".so"))
 
 - module-name: 'scapy.all' # checksum: 8a9944ce
   implicit-imports:
@@ -7498,6 +7547,11 @@
         'PYTORCH_JIT': '0'
       when: 'get_parameter("disable-jit", "yes" if standalone else "no") == "yes"'
 
+- module-name: 'torch._dynamo.polyfills.loader' # checksum: e5019356
+  implicit-imports:
+    - depends:
+        - 'torch._dynamo.polyfills.*'
+
 - module-name: 'torch._dynamo.skipfiles' # checksum: 120e0012
   anti-bloat:
     # When calling inspect.getfile() on Nuitka's loader, it will yield

nuitka/tools/environments/Virtualenv.py

@@ -18,6 +18,7 @@ from nuitka.utils.Execution import (
 )
 from nuitka.utils.FileOperations import (
     getDirectoryRealPath,
+    relpath,
     removeDirectory,
     withDirectoryChange,
 )
@@ -28,15 +29,20 @@ class Virtualenv(object):
         self.env_dir = os.path.abspath(env_dir)
         self.logger = logger
 
-    def runCommand(self, commands, env=None, style=None):
+    def runCommand(self, commands, keep_cwd=False, env=None, style=None):
         if type(commands) in (str, unicode):
             commands = [commands]
 
-        with withDirectoryChange(self.env_dir):
+        with withDirectoryChange(None if keep_cwd else self.env_dir, allow_none=True):
+            if keep_cwd:
+                activate_dir = relpath(self.env_dir, os.getcwd())
+            else:
+                activate_dir = "."
+
             if os.name == "nt":
-                commands = [r"call scripts\activate.bat"] + commands
+                commands = [r"call %s\scripts\activate.bat" % activate_dir] + commands
             else:
-                commands = [". bin/activate"] + commands
+                commands = [". %s/bin/activate" % activate_dir] + commands
 
             command = " && ".join(commands)
 
@@ -47,7 +53,9 @@ class Virtualenv(object):
                 exit_code = os.system(command)
                 if exit_code != 0:
                     self.logger.info(
-                        "Failure %s for: %s" % (exit_code, command), style=style
+                        "Failure %s for: %s" % (exit_code, command),
+                        keep_format=True,
+                        style=style,
                     )
 
                     raise NuitkaCalledProcessError(

nuitka/tools/podman/__main__.py

@@ -275,7 +275,7 @@ def _checkContainerArgument(options, default_container_directory):
             container_file_path_template = container_file_path
             container_file_path = container_file_path[:-3]
         else:
-            assert False
+            container_file_path_template = None
 
         options.container_id = changeFilenameExtension(
             os.path.basename(container_file_path), ""
@@ -306,7 +306,9 @@ def main():
         options=options, default_container_directory=default_container_directory
     )
 
-    if os.path.isfile(container_file_path_template):
+    if container_file_path_template is not None and os.path.isfile(
+        container_file_path_template
+    ):
         # Check requirement.
         cpp_path = getCppPath()
         command = [

nuitka/utils/FileOperations.py

@@ -890,7 +890,7 @@ def changeTextFileContents(filename, contents, encoding=None, compare_only=False
         or getFileContents(filename, encoding=encoding) != contents
     ):
         if not compare_only:
-            putTextFileContents(filename, contents)
+            putTextFileContents(filename, contents, encoding=encoding)
 
         return True
     else:
@@ -1515,6 +1515,9 @@ def getNormalizedPath(path):
     if isWin32Windows():
         path = path.replace("/", "\\")
 
+    if isMacOS():
+        path = os.path.expanduser(path)
+
     return path
 
 

nuitka/utils/Hashing.py

@@ -7,6 +7,7 @@ Offers support for hashing incrementally and files esp. without having
 to read their contents.
 """
 
+import struct
 from binascii import crc32
 
 from nuitka.__past__ import md5, unicode
@@ -111,10 +112,13 @@ class HashCRC32(HashBase):
         self.hash = crc32(value, self.hash)
 
     def asDigest(self):
+        if self.hash < 0:
+            return struct.unpack("I", struct.pack("i", self.hash))[0]
+
         return self.hash
 
     def asHexDigest(self):
-        return hex(self.hash)[2:]
+        return hex(self.asDigest())[2:]
 
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/utils/SharedLibraries.py

@@ -258,6 +258,29 @@ def _getMacOSArchOption():
         return ()
 
 
+# TODO: Use this for more output filters.
+def _filterOutputByLine(output, filter_func):
+    non_errors = []
+
+    for line in output.splitlines():
+        if line and not filter_func(line):
+            non_errors.append(line)
+
+    output = b"\n".join(non_errors)
+
+    return (0 if non_errors else None), output
+
+
+def _filterOtoolErrorOutput(stderr):
+    def isNonErrorExit(line):
+        if b"missing from root that overrides" in line:
+            return True
+
+        return False
+
+    return _filterOutputByLine(stderr, isNonErrorExit)
+
+
 def _getOToolCommandOutput(otool_option, filename):
     filename = os.path.abspath(filename)
 
@@ -272,6 +295,7 @@ def _getOToolCommandOutput(otool_option, filename):
         _otool_output_cache[cache_key] = executeToolChecked(
             logger=postprocessing_logger,
             command=command,
+            stderr_filter=_filterOtoolErrorOutput,
             absence_message="The 'otool' is used to analyze dependencies on macOS and required to be found.",
         )
 

nuitka/utils/Signing.py

@@ -6,6 +6,7 @@
 """
 
 from nuitka.Options import (
+    getMacOSSignedAppName,
     getMacOSSigningIdentity,
     shallUseSigningForNotarization,
 )
@@ -104,9 +105,16 @@ def addMacOSCodeSignature(filenames):
         "--force",
         "--deep",
         "--preserve-metadata=entitlements",
-        # ,
     ]
 
+    macos_signed_app_name = getMacOSSignedAppName()
+
+    if macos_signed_app_name is not None:
+        command += [
+            "-i",
+            macos_signed_app_name,
+        ]
+
     if shallUseSigningForNotarization():
         command.append("--options=runtime")