Nuitka-winsvc 1.9.2__tar.gz → 1.9.3__tar.gz

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 1.9.2
+Version: 1.9.3
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 1.9.2
+Version: 1.9.3
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V1.9.2
+Nuitka V1.9.3
 Copyright (C) 2023 Kay Hayen."""
 
 

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/build/Backend.scons

@@ -464,10 +464,17 @@ if env.debug_mode:
     if env.gcc_mode:
         # Allow gcc/clang to point out all kinds of inconsistency to us by
         # raising an error.
+
+        if "allow-c-warnings" not in env.experimental_flags:
+            env.Append(
+                CCFLAGS=[
+                    "-Wall",
+                    "-Werror",
+                ]
+            )
+
         env.Append(
             CCFLAGS=[
-                "-Wall",
-                "-Werror",
                 # Unfortunately Py_INCREF(Py_False) triggers aliasing warnings,
                 # which are unfounded, so disable them.
                 "-Wno-error=strict-aliasing",

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/build/Onefile.scons

@@ -371,14 +371,6 @@ if debug_mode:
             CCFLAGS=[
                 "-Wall",
                 "-Werror",
-                # Unfortunately Py_INCREF(Py_False) triggers aliasing warnings,
-                # which are unfounded, so disable them.
-                "-Wno-error=strict-aliasing",
-                "-Wno-strict-aliasing",
-                # At least for self-compiled Python3.2, and MinGW this happens
-                # and has little use anyway.
-                "-Wno-error=format",
-                "-Wno-format",
             ]
         )
 

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/build/static_src/MainProgram.c

@@ -364,6 +364,8 @@ static int multiprocessing_resource_tracker_arg = -1;
 // This is a joblib loky fork
 #ifdef _WIN32
 static bool is_joblib_popen_loky_win32 = false;
+static int loky_joblib_pipe_handle_arg = 0;
+static int loky_joblib_parent_pid_arg = 0;
 #else
 static bool is_joblib_popen_loky_posix = false;
 #endif
@@ -440,6 +442,15 @@ static void setCommandLineParameters(int argc, wchar_t **argv) {
                 is_joblib_popen_loky_win32 = true;
                 break;
             }
+
+            if (scanFilename(argv[i + 1],
+                             FILENAME_EMPTY_STR "from joblib.externals.loky.backend.popen_loky_win32 import main; "
+                                                "main(pipe_handle=%i, parent_pid=%i)",
+                             &loky_joblib_pipe_handle_arg, &loky_joblib_parent_pid_arg)) {
+                is_joblib_popen_loky_win32 = true;
+                break;
+            }
+
 #endif
         }
 
@@ -1500,7 +1511,20 @@ orig_argv = argv;
         PyObject *main_function = PyObject_GetAttrString(joblib_popen_loky_win32_module, "main");
         CHECK_OBJECT(main_function);
 
-        CALL_FUNCTION_NO_ARGS(tstate, main_function);
+        if (loky_joblib_pipe_handle_arg == 0) {
+            CALL_FUNCTION_NO_ARGS(tstate, main_function);
+        } else {
+            char const *kw_keys[] = {"pipe_handle", "parent_pid"};
+            PyObject *kw_values[] = {
+                PyLong_FromLong(loky_joblib_pipe_handle_arg),
+                PyLong_FromLong(loky_joblib_parent_pid_arg),
+            };
+
+            PyObject *kw_args = MAKE_DICT_X_CSTR(kw_keys, kw_values, sizeof(kw_values) / sizeof(PyObject *));
+
+            CALL_FUNCTION_WITH_KEYARGS(tstate, main_function, kw_args);
+        }
+        static int loky_joblib_parent_pid_arg = 0;
 
         int exit_code = HANDLE_PROGRAM_EXIT(tstate);
 

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/code_generation/ImportCodes.py

@@ -189,12 +189,14 @@ def generateImportModuleHardCode(to_name, expression, emit, context):
             emit(
                 renderTemplateFromString(
                     r"""
+{% if import_gives_ref %}
 {
     PyObject *hard_module = {{module_getter_code1}};
-{% if import_gives_ref %}
     Py_DECREF(hard_module);
-{% endif %}
 }
+{% else %}
+{{module_getter_code1}};
+{% endif %}
 {{value_name}} = {{module_getter_code2}};
 """,
                     value_name=value_name,

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/freezer/DllDependenciesPosix.py

@@ -28,7 +28,11 @@ from nuitka.PythonFlavors import isAnacondaPython
 from nuitka.Tracing import inclusion_logger
 from nuitka.utils.Execution import executeProcess, withEnvironmentPathAdded
 from nuitka.utils.SharedLibraries import getSharedLibraryRPATH
-from nuitka.utils.Utils import isAlpineLinux, isPosixWindows
+from nuitka.utils.Utils import (
+    isAlpineLinux,
+    isAndroidBasedLinux,
+    isPosixWindows,
+)
 
 from .DllDependenciesCommon import getLdLibraryPath
 
@@ -214,3 +218,6 @@ if isAnacondaPython() or isAlpineLinux():
     # so they have to be included.
     # Alpine linux does not include `libstdc++.so` by default.
     _linux_dll_ignore_list.remove("libstdc++.so")
+
+if isAndroidBasedLinux():
+    _linux_dll_ignore_list.remove("libz.so")

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/nodes/PackageMetadataNodes.py

@@ -75,11 +75,19 @@ class ExpressionPkgResourcesRequireCall(ExpressionPkgResourcesRequireCallBase):
     kind = "EXPRESSION_PKG_RESOURCES_REQUIRE_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        require = _getPkgResourcesModule().require
-        ResolutionError = _getPkgResourcesModule().ResolutionError
-        InvalidRequirement = (
-            _getPkgResourcesModule().extern.packaging.requirements.InvalidRequirement
-        )
+        resources_module = _getPkgResourcesModule()
+
+        require = resources_module.require
+        ResolutionError = resources_module.ResolutionError
+
+        try:
+            InvalidRequirement = (
+                resources_module.extern.packaging.requirements.InvalidRequirement
+            )
+        except AttributeError:
+            InvalidRequirement = (
+                resources_module.packaging.requirements.InvalidRequirement
+            )
 
         args = tuple(
             element.getCompileTimeConstant() for element in self.subnode_requirements
@@ -135,8 +143,9 @@ class ExpressionPkgResourcesGetDistributionCall(
     kind = "EXPRESSION_PKG_RESOURCES_GET_DISTRIBUTION_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        get_distribution = _getPkgResourcesModule().get_distribution
-        DistributionNotFound = _getPkgResourcesModule().DistributionNotFound
+        pkg_resources_module = _getPkgResourcesModule()
+        get_distribution = pkg_resources_module.get_distribution
+        DistributionNotFound = pkg_resources_module.DistributionNotFound
 
         arg = self.subnode_dist.getCompileTimeConstant()
 
@@ -363,8 +372,9 @@ class ExpressionPkgResourcesIterEntryPointsCall(
     kind = "EXPRESSION_PKG_RESOURCES_ITER_ENTRY_POINTS_CALL"
 
     def replaceWithCompileTimeValue(self, trace_collection):
-        iter_entry_points = _getPkgResourcesModule().iter_entry_points
-        DistributionNotFound = _getPkgResourcesModule().DistributionNotFound
+        pkg_resources_module = _getPkgResourcesModule()
+        iter_entry_points = pkg_resources_module.iter_entry_points
+        DistributionNotFound = pkg_resources_module.DistributionNotFound
 
         group = self.subnode_group.getCompileTimeConstant()
         if self.subnode_name is not None:

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/plugins/PluginBase.py

@@ -1214,7 +1214,7 @@ except ImportError:
             }
         )
 
-        if isWin32Windows():
+        if isWin32Windows() or isMacOS():
             context.update(
                 {
                     "arch_x86": getArchitecture() == "x86",

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/plugins/standard/AntiBloatPlugin.py

@@ -603,13 +603,14 @@ Error, cannot eval module '%s' function '%s' replacement code '%s' in '%s' due t
                 return
 
             if module_name.hasNamespace(handled_module_name):
-                override_mode = self._getModuleBloatModeOverrides(
-                    using_module_name=using_module_name,
-                    intended_module_name=intended_module_name,
-                )
+                if using_module_name is not None:
+                    override_mode = self._getModuleBloatModeOverrides(
+                        using_module_name=using_module_name,
+                        intended_module_name=intended_module_name,
+                    )
 
-                if override_mode is not None:
-                    mode = override_mode
+                    if override_mode is not None:
+                        mode = override_mode
 
                 # Make sure the compilation aborts or warns if asked to
                 if mode == "error":

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/plugins/standard/DllFilesPlugin.py

@@ -87,6 +87,8 @@ class NuitkaPluginDllFiles(NuitkaPluginBase):
             exe = dll_config.get("executable", "no") == "yes"
 
             suffixes = dll_config.get("suffixes")
+            if suffixes is not None:
+                suffixes = tuple(suffix.lstrip(".") for suffix in suffixes)
 
             for prefix in dll_config.get("prefixes"):
                 if exe:

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/plugins/standard/ImplicitImports.py

@@ -395,22 +395,25 @@ __file__ = (__nuitka_binary_dir + '%ssite.py') if '__nuitka_binary_dir' in dict(
 
                 # Inline the values, to avoid the data files.
                 if result is not None:
-                    source_code = source_code.replace(
-                        attach_call,
-                        attach_call_replacement
-                        % {
-                            "module_name": module_name.asString(),
-                            "submodules": tuple(
-                                module_name.asString() for module_name in result[0]
-                            ),
-                            "attrs": dict(
-                                (module_name.asString(), module_attributes)
-                                for (module_name, module_attributes) in sorted(
-                                    result[1].items()
-                                )
-                            ),
-                        },
-                    )
+                    replacement = attach_call_replacement % {
+                        "module_name": module_name.asString(),
+                        "submodules": tuple(
+                            sub_module_name.asString() for sub_module_name in result[0]
+                        ),
+                        "attrs": dict(
+                            (
+                                sub_module_name.getChildNameFromPackage(
+                                    module_name
+                                ).asString(),
+                                module_attributes,
+                            )
+                            for (sub_module_name, module_attributes) in sorted(
+                                result[1].items()
+                            )
+                        ),
+                    }
+
+                    source_code = source_code.replace(attach_call, replacement)
 
         if module_name == "huggingface_hub":
             # Special handling for huggingface that uses the source code variant

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -326,6 +326,57 @@
       change_function:
         'test': 'un-callable'
 
+- module-name: 'bitsandbytes.cextension'
+  dlls:
+    - from_filenames:
+        prefixes:
+          - 'libbitsandbytes_'
+        suffixes:
+          # Applies currently to all OSes in bitsandbytes wheels.
+          - 'so'
+
+- module-name: 'bitsandbytes.triton.dequantize_rowwise'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.int8_matmul_mixed_dequanitze'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.int8_matmul_rowwise_dequantize'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_columnwise_and_transpose'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_global'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
+- module-name: 'bitsandbytes.triton.quantize_rowwise'
+  anti-bloat:
+    - description: 'remove setuptools usage via triton'
+      replacements_plain:
+        'is_triton_available()': 'False'
+      when: 'not use_setuptools'
+
 - module-name: 'boto3'
   data-files:
     dirs:
@@ -508,6 +559,7 @@
   implicit-imports:
     - depends:
         - 'chromadb.telemetry.posthog'
+        - 'chromadb.telemetry.product.posthog'
         - 'chromadb.api.local'
         - 'chromadb.db.duckdb'
         - 'chromadb.db.impl.sqlite'
@@ -518,6 +570,7 @@
         - 'chromadb.migrations.embeddings_queue'
         - 'chromadb.migrations.sysdb'
         - 'chromadb.migrations.metadb'
+        - 'chromadb.ingest.impl.simple_policy'
 
 - module-name: 'chromadb.migrations.embeddings_queue'
   data-files:
@@ -769,7 +822,7 @@
         relative_path: 'OSX64'
         prefixes:
           - 'libDelphiFMX'
-      when: 'macos and arch_x86'
+      when: 'macos and arch_amd64'
     - from_filenames:
         relative_path: 'OSXARM64'
         prefixes:
@@ -798,6 +851,13 @@
       replacements_plain:
         'from .testing import setup_test': ''
 
+- module-name: 'distributed.client'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'distributed.config'
   data-files:
     patterns:
@@ -810,6 +870,13 @@
         'from IPython.display import display': 'raise ImportError'
       when: 'not use_ipython'
 
+- module-name: 'distributed.diagnostics.progressbar'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'distributed.scheduler'
   anti-bloat:
     - description: 'remove cython support'
@@ -818,6 +885,13 @@
         'from cython import compiled': 'raise ImportError'
         'if compiled:': 'if False:'
 
+- module-name: 'distributed.utils'
+  anti-bloat:
+    - description: 'remove IPython reference'
+      change_function:
+        'is_kernel': "'(lambda : False)'"
+      when: 'not use_ipython'
+
 - module-name: 'dns.rdtypes'
   implicit-imports:
     - depends:
@@ -1433,6 +1507,8 @@
     - description: 'workaround for forking itself'
       replacements_plain:
         "getattr(sys, 'frozen', False)": 'False'
+        'getattr(sys, "frozen", False)': 'False'
+        'assert is_forking(sys.argv), "Not forking"': ''
       when: 'win32'
 
 - module-name: 'joblib.externals.loky.backend.resource_tracker'
@@ -4150,6 +4226,13 @@
         - 'skimage.restoration._unwrap_2d'
         - 'skimage.restoration._unwrap_3d'
 
+- module-name: 'skimage.restoration._cycle_spin'
+  anti-bloat:
+    - description: 'remove optional dask usage'
+      replacements_plain:
+        'import dask': 'raise ImportError'
+      when: 'not use_dask'
+
 - module-name: 'skimage.segmentation'
   implicit-imports:
     - depends:

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/reports/Reports.py

@@ -169,6 +169,9 @@ def _getReportInputData(aborted):
         if _decision is not False:
             continue
 
+        if _using_module_name is None:
+            continue
+
         module_exclusions[_using_module_name][_module_name] = _reason
 
     memory_infos = getMemoryInfos()

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/utils/Distributions.py

@@ -19,6 +19,7 @@
 
 import os
 
+from nuitka.__past__ import unicode
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import isExperimental
 from nuitka.PythonFlavors import isAnacondaPython
@@ -215,6 +216,8 @@ def getDistributionFromModuleName(module_name):
 
 def getDistribution(distribution_name):
     """Get a distribution by name."""
+    assert isValidDistributionName(distribution_name), distribution_name
+
     try:
         if isExperimental("force-pkg-resources-metadata"):
             raise ImportError
@@ -254,10 +257,16 @@ def isDistributionPipPackage(distribution_name):
     return getDistributionInstallerName(distribution_name) == "pip"
 
 
+def isDistributionPoetryPackage(distribution_name):
+    return getDistributionInstallerName(distribution_name).startswith("poetry")
+
+
 def isDistributionSystemPackage(distribution_name):
-    result = not isDistributionPipPackage(
-        distribution_name
-    ) and not isDistributionCondaPackage(distribution_name)
+    result = (
+        not isDistributionPipPackage(distribution_name)
+        and not isDistributionPoetryPackage(distribution_name)
+        and not isDistributionCondaPackage(distribution_name)
+    )
 
     # This should only ever happen on Linux, lets know when it does happen
     # elsewhere, since that is most probably a bug in our installer detection on
@@ -338,6 +347,10 @@ def getDistributionInstallerName(distribution_name):
     return _distribution_to_installer[distribution_name]
 
 
+def isValidDistributionName(distribution_name):
+    return type(distribution_name) in (str, unicode)
+
+
 def getDistributionName(distribution):
     """Get the distribution name from a distribution object.
 
@@ -347,9 +360,12 @@ def getDistributionName(distribution):
     """
 
     if hasattr(distribution, "metadata"):
-        return distribution.metadata["Name"]
+        result = distribution.metadata["Name"]
     else:
-        return distribution.project_name
+        result = distribution.project_name
+
+    assert isValidDistributionName(result), distribution
+    return result
 
 
 def getDistributionVersion(distribution):

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/utils/FileOperations.py

@@ -1053,6 +1053,10 @@ def isFilenameBelowPath(path, filename, consider_short=True):
             filename = getExternalUsePath(filename)
             path = getExternalUsePath(path)
 
+            if isWin32Windows():
+                if getWindowsDrive(path) != getWindowsDrive(filename):
+                    return False
+
             result = os.path.relpath(filename, path).split(os.path.sep)[0] != ".."
 
     return result

{Nuitka-winsvc-1.9.2 → Nuitka-winsvc-1.9.3}/nuitka/utils/ModuleNames.py

@@ -225,6 +225,13 @@ class ModuleName(str):
         else:
             return ModuleName(parent_new)
 
+    def getChildNameFromPackage(self, package_name):
+        """Get child a module name part for a name in the package."""
+        assert self.hasNamespace(package_name)
+
+        submodule_name_str = str(self)[len(str(package_name)) + 1 :]
+        return ModuleName(submodule_name_str)
+
     def matchesToShellPattern(self, pattern):
         """Match a module name to a list of patterns