Nuitka-winsvc 2.6__tar.gz → 2.6.5__tar.gz

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/Nuitka_winsvc.egg-info/PKG-INFO

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

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/Nuitka_winsvc.egg-info/SOURCES.txt

@@ -680,6 +680,9 @@ nuitka/build/inline_copy/markupsafe/markupsafe/_constants.py
 nuitka/build/inline_copy/markupsafe/markupsafe/_native.py
 nuitka/build/inline_copy/pefile/LICENSE.txt
 nuitka/build/inline_copy/pefile/pefile.py
+nuitka/build/inline_copy/pefile/ordlookup/__init__.py
+nuitka/build/inline_copy/pefile/ordlookup/oleaut32.py
+nuitka/build/inline_copy/pefile/ordlookup/ws2_32.py
 nuitka/build/inline_copy/pkg_resources/pkg_resources/__init__.py
 nuitka/build/inline_copy/pkg_resources/pkg_resources/py31compat.py
 nuitka/build/inline_copy/python_hacl/LICENSE.txt
@@ -1293,6 +1296,7 @@ nuitka/tools/watch/__main__.py
 nuitka/tree/Building.py
 nuitka/tree/ComplexCallHelperFunctions.py
 nuitka/tree/Extractions.py
+nuitka/tree/FutureSpecState.py
 nuitka/tree/InternalModule.py
 nuitka/tree/Operations.py
 nuitka/tree/ReformulationAssertStatements.py

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/PKG-INFO

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

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/README.rst

@@ -877,10 +877,10 @@ This is an example workflow that builds on all 3 OSes
             # many more Nuitka options available, see action doc, but it's best
             # to use nuitka-project: options in your code, so e.g. you can make
             # a difference for macOS and create an app bundle there.
-            onefile: true
+            mode: onefile
 
          - name: Upload Artifacts
-         uses: actions/upload-artifact@v3
+         uses: actions/upload-artifact@v4
          with:
             name: ${{ runner.os }} Build
             path: | # match what's created for the 3 OSes

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/BytecodeCaching.py

@@ -12,6 +12,7 @@ import sys
 
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.importing.Importing import locateModule, makeModuleUsageAttempt
+from nuitka.ModuleRegistry import getModuleOptimizationTimingInfos
 from nuitka.plugins.Plugins import Plugins
 from nuitka.utils.AppDirs import getCacheDir
 from nuitka.utils.FileOperations import makePath
@@ -50,7 +51,7 @@ def hasCachedImportedModuleUsageAttempts(module_name, source_code, source_ref):
 
 
 # Bump this is format is changed or enhanced implementation might different ones.
-_cache_format_version = 6
+_cache_format_version = 7
 
 
 def getCachedImportedModuleUsageAttempts(module_name, source_code, source_ref):
@@ -118,11 +119,20 @@ def getCachedImportedModuleUsageAttempts(module_name, source_code, source_ref):
         # something changed there.
         pass
 
-    return result
+    # The Json doesn't store integer keys.
+    for pass_timing_info in data["timing_infos"]:
+        pass_timing_info[3] = dict(
+            (int(key), value) for (key, value) in pass_timing_info[3].items()
+        )
+
+    return result, data["timing_infos"]
 
 
 def writeImportedModulesNamesToCache(
-    module_name, source_code, used_modules, distribution_names
+    module_name,
+    source_code,
+    used_modules,
+    distribution_names,
 ):
     cache_name = makeCacheName(module_name, source_code)
     cache_filename = _getCacheFilename(cache_name, "json")
@@ -138,6 +148,7 @@ def writeImportedModulesNamesToCache(
         # We use a tuple, so preserve the order.
         "modules_used": used_modules,
         "distribution_names": distribution_names,
+        "timing_infos": getModuleOptimizationTimingInfos(module_name),
     }
 
     makePath(os.path.dirname(cache_filename))

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/ModuleRegistry.py

@@ -14,6 +14,7 @@
 import collections
 import os
 
+from nuitka.containers.Namedtuples import makeNamedtupleClass
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.PythonVersions import python_version
 
@@ -234,7 +235,7 @@ def addModuleInfluencingCondition(
 
 
 def addModuleInfluencingVariable(
-    module_name, plugin_name, variable_name, control_tags, result
+    module_name, config_module_name, plugin_name, variable_name, control_tags, result
 ):
     if module_name not in module_influencing_plugins:
         module_influencing_plugins[module_name] = OrderedSet()
@@ -242,7 +243,7 @@ def addModuleInfluencingVariable(
         (
             plugin_name,
             "variable-used",
-            (variable_name, tuple(control_tags), repr(result)),
+            (variable_name, tuple(control_tags), repr(result), config_module_name),
         )
     )
 
@@ -278,7 +279,8 @@ def getModuleInfluences(module_name):
 # Information about how long the optimization took.
 module_timing_infos = {}
 
-ModuleOptimizationTimingInfo = collections.namedtuple(
+
+ModuleOptimizationTimingInfo = makeNamedtupleClass(
     "ModuleOptimizationTimingInfo",
     ("pass_number", "time_used", "micro_passes", "merge_counts"),
 )
@@ -288,6 +290,13 @@ def addModuleOptimizationTimeInformation(
     module_name, pass_number, time_used, micro_passes, merge_counts
 ):
     module_timing_info = list(module_timing_infos.get(module_name, []))
+
+    # Do not record cached bytecode loaded timing information, not useful
+    # and duplicate, we want the original values.
+    if pass_number == 1 and len(module_timing_info) == 1:
+        assert micro_passes == 0
+        return
+
     module_timing_info.append(
         ModuleOptimizationTimingInfo(
             pass_number=pass_number,
@@ -303,6 +312,12 @@ def getModuleOptimizationTimingInfos(module_name):
     return module_timing_infos.get(module_name, ())
 
 
+def setModuleOptimizationTimingInfos(module_name, timing_infos):
+    module_timing_infos[module_name] = [
+        ModuleOptimizationTimingInfo(*timing_info) for timing_info in timing_infos
+    ]
+
+
 def getImportedModuleNames():
     result = OrderedSet()
 

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/Options.py

@@ -44,6 +44,7 @@ from nuitka.PythonFlavors import (
     isPyenvPython,
     isTermuxPython,
     isUninstalledPython,
+    isUvPython,
 )
 from nuitka.PythonVersions import (
     getLaunchingSystemPrefixPath,
@@ -883,8 +884,16 @@ options instead."""
             )
 
     if options.static_libpython == "yes" and getSystemStaticLibPythonPath() is None:
+        usable, reason = _couldUseStaticLibPython()
+
         Tracing.options_logger.sysexit(
-            "Error, static libpython is not found or not supported for this Python installation."
+            """\
+Error, a static libpython is either not found or not supported for \
+this Python (%s) installation: %s"""
+            % (
+                getPythonFlavorName(),
+                (reason if not usable else "unknown reason"),
+            )
         )
 
     if shallUseStaticLibPython() and getSystemStaticLibPythonPath() is None:
@@ -1674,85 +1683,102 @@ def shallOptimizeStringExec():
 _shall_use_static_lib_python = None
 
 
-def _shallUseStaticLibPython():
-    # many cases and return driven, pylint: disable=too-many-branches,too-many-return-statements
+def _couldUseStaticLibPython():
+    # many cases and return driven,
+    # pylint: disable=too-many-branches,too-many-return-statements
 
-    if shallMakeModule():
-        return False, "not used in module mode"
+    # Nuitka-Python is good to to static linking.
+    if isNuitkaPython():
+        return True, "Nuitka-Python is unexpectedly broken."
 
-    if options.static_libpython == "auto":
-        # Nuitka-Python is good to to static linking.
-        if isNuitkaPython():
-            return True, "Nuitka-Python is unexpectedly broken."
+    if isHomebrewPython():
+        return True, "Homebrew Python is unexpectedly broken."
 
-        if isHomebrewPython():
-            return True, "Homebrew Python is unexpectedly broken."
+    # Debian packages with are usable if the OS is new enough
+    from nuitka.utils.StaticLibraries import isDebianSuitableForStaticLinking
 
-        # Debian packages with are usable if the OS is new enough
-        from nuitka.utils.StaticLibraries import (
-            isDebianSuitableForStaticLinking,
-        )
-
-        if (
-            isDebianBasedLinux()
-            and isDebianPackagePython()
-            and isDebianSuitableForStaticLinking()
-            and not shallUsePythonDebug()
+    if (
+        isDebianBasedLinux()
+        and isDebianPackagePython()
+        and isDebianSuitableForStaticLinking()
+        and not shallUsePythonDebug()
+    ):
+        if python_version >= 0x3C0 and not os.path.exists(
+            getInlineCopyFolder("python_hacl")
         ):
-            if python_version >= 0x3C0 and not os.path.exists(
-                getInlineCopyFolder("python_hacl")
-            ):
-                return (
-                    False,
-                    "Nuitka on Debian-Python needs inline copy of hacl not included.",
-                )
-
-            return True, "Nuitka on Debian-Python needs package '%s' installed." % (
-                "python2-dev" if str is bytes else "python3-dev"
+            return (
+                False,
+                "Nuitka on Debian-Python needs inline copy of hacl not included.",
             )
 
-        if isMSYS2MingwPython():
-            return True, "Nuitka on MSYS2 needs package 'python-devel' installed."
-
-        # For Anaconda default to trying static lib python library, which
-        # normally is just not available or if it is even unusable.
-        if isAnacondaPython():
-            if isMacOS():
-                # TODO: Maybe some linker options can make it happen.
-                return (
-                    False,
-                    "Anaconda on macOS exports not all symbols when using it.",
-                )
-            elif not isWin32Windows():
-                return (
-                    True,
-                    """\
-Nuitka on Anaconda needs package for static libpython installed. \
-Execute 'conda install libpython-static'.""",
-                )
+        return True, "Nuitka on Debian-Python needs package '%s' installed." % (
+            "python2-dev" if str is bytes else "python3-dev"
+        )
 
-        if isPyenvPython():
-            return True, "Nuitka on pyenv should not use '--enable-shared'."
+    if isMSYS2MingwPython():
+        return True, "Nuitka on MSYS2 needs package 'python-devel' installed."
 
-        if isManyLinuxPython():
+    # For Anaconda default to trying static lib python library, which
+    # normally is just not available or if it is even unusable.
+    if isAnacondaPython():
+        if isMacOS():
+            # TODO: Maybe some linker options can make it happen.
+            return (
+                False,
+                "Anaconda on macOS exports not all symbols when using it.",
+            )
+        elif not isWin32Windows():
             return (
                 True,
                 """\
+Nuitka on Anaconda needs package for static libpython installed. \
+Execute 'conda install libpython-static'.""",
+            )
+
+    if isUvPython():
+        return (
+            False,
+            """\
+Static link library of UV-Python is currently using dependent libraries \
+such as tcl that are not included, but would be needed. Please help them \
+improve it for best performance of the result.""",
+        )
+
+    if isPyenvPython():
+        return True, "Nuitka on pyenv should not use '--enable-shared'."
+
+    if isManyLinuxPython():
+        return (
+            True,
+            """\
 Nuitka on 'manylinux' has no shared libraries. Use container with \
 the command 'RUN cd /opt/_internal && tar xf static-libs-for-embedding-only.tar.xz' \
 added to provide the static link library.""",
-            )
+        )
+
+    if isMacOS() and isCPythonOfficialPackage():
+        return True, None
+
+    if isArchPackagePython():
+        return True, None
+
+    # If not dynamic link library is available, the static link library will
+    # have to do it.
+    if isStaticallyLinkedPython():
+        return True, None
+
+    return None, None
+
 
-        if isMacOS() and isCPythonOfficialPackage():
-            return True, None
+def _shallUseStaticLibPython():
+    if shallMakeModule():
+        return False, "not used in module mode"
 
-        if isArchPackagePython():
-            return True, None
+    if options.static_libpython == "auto":
+        result = _couldUseStaticLibPython()
 
-        # If not dynamic link library is available, the static link library will
-        # have to do it.
-        if isStaticallyLinkedPython():
-            return True, None
+        if result[0] is not None:
+            return result
 
     return options.static_libpython == "yes", None
 
@@ -2116,6 +2142,8 @@ def shallOnefileAsArchive():
 
 
 def _checkIconPaths(icon_paths):
+    icon_paths = tuple(icon_paths)
+
     for icon_path in icon_paths:
         if not os.path.exists(icon_path):
             Tracing.options_logger.sysexit(
@@ -2155,10 +2183,8 @@ def getLinuxIconPaths():
 
 def getMacOSIconPaths():
     """*list of str*, values of ``--macos-app-icon``"""
-    return tuple(
-        _checkIconPaths(
-            icon_path for icon_path in options.macos_icon_path if icon_path != "none"
-        )
+    return _checkIconPaths(
+        icon_path for icon_path in options.macos_icon_path if icon_path != "none"
     )
 
 

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/PythonFlavors.py

@@ -143,6 +143,16 @@ def isRyePython():
     return False
 
 
+def isUvPython():
+    if isWin32Windows():
+        return r"AppData\Roaming\uv" in getSystemPrefixPath()
+    else:
+        if getSystemPrefixPath().startswith(os.path.expanduser("~/.local/share/uv")):
+            return True
+
+    return False
+
+
 def isPyenvPython():
     if isWin32Windows():
         return False
@@ -183,6 +193,9 @@ def isUninstalledPython():
     if isSelfCompiledPythonUninstalled():
         return True
 
+    if isUvPython():
+        return True
+
     if isStaticallyLinkedPython():
         return False
 
@@ -376,6 +389,8 @@ def getPythonFlavorName():
         return "Homebrew Python"
     elif isRyePython():
         return "Rye Python"
+    elif isUvPython():
+        return "UV-Python"
     elif isApplePython():
         return "Apple Python"
     elif isPyenvPython():

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.6
+Nuitka V2.6.5
 Copyright (C) 2025 Kay Hayen."""
 
 

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/build/SconsCompilerSettings.py

@@ -684,10 +684,9 @@ def setupCCompiler(env, lto_mode, pgo_mode, job_count, onefile_compile):
         env.Append(CCFLAGS=[target_flag])
         env.Append(LINKFLAGS=[target_flag])
 
-    # The 32 bits MinGW does not default for API level properly, so help it.
-    if env.mingw_mode:
-        # Windows XP
-        env.Append(CPPDEFINES=["_WIN32_WINNT=0x0501"])
+    # The MinGW64 and ClangCL do not default for API level properly, so
+    # help it.
+    env.Append(CPPDEFINES=["_WIN32_WINNT=0x0601"])
 
     # Unicode entry points for programs.
     if env.mingw_mode:

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/build/SconsInterface.py

@@ -307,7 +307,7 @@ import subprocess
 
 exit_code = subprocess.call(
     %(scons_command)r,
-    env={%(env)s}
+    env={%(env)s},
     shell=False
 )"""
         % {
@@ -339,7 +339,7 @@ cd "${0%/*}"
         contents="""\
 %(script_prelude)s
 
-'%(scons_python)s' '%(scons_debug_script_name)s'
+"%(scons_python)s" "%(scons_debug_script_name)s"
 """
         % {
             "script_prelude": script_prelude,

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/build/include/nuitka/compiled_frame.h

@@ -147,7 +147,7 @@ NUITKA_MAY_BE_UNUSED static inline bool isFrameUnusable(struct Nuitka_FrameObjec
         // Still in use
         Py_REFCNT(frame_object) > 1 ||
 #if PYTHON_VERSION < 0x300
-        // Last used by another thread (TODO: Could just set it when re-using)
+        // Last used by another thread (TODO: Could just set it when reusing)
         frame_object->m_frame.f_tstate != PyThreadState_GET() ||
 #endif
         // Not currently linked.

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/build/include/nuitka/exceptions.h

@@ -648,7 +648,7 @@ NUITKA_MAY_BE_UNUSED static bool _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(PyThreadSta
 
    Equivalent to if(PyErr_ExceptionMatches(PyExc_StopIteration) PyErr_Clear();
 
-   If error is raised by built-in function next() and an iterator’s __next__()
+   If error is raised by built-in function next() and an iterator's __next__()
    method to signal that there are no further items produced by the iterator then
    it resets the TSTATE to NULL and returns True else return False
 

{nuitka_winsvc-2.6 → nuitka_winsvc-2.6.5}/nuitka/build/include/nuitka/type_aliases.h

@@ -9,7 +9,7 @@
 #endif
 
 // Helpers for type aliases, type variables, and generic base classes.
-extern PyObject *MAKE_TYPE_ALIAS(PyObject *name, PyObject *type_params, PyObject *compute_value);
+extern PyObject *MAKE_TYPE_ALIAS(PyObject *name, PyObject *type_params, PyObject *value, PyObject *module_name);
 extern PyObject *MAKE_TYPE_VAR(PyThreadState *tstate, PyObject *name);
 extern PyObject *MAKE_TYPE_GENERIC(PyThreadState *tstate, PyObject *params);
 

nuitka_winsvc-2.6.5/nuitka/build/inline_copy/pefile/ordlookup/__init__.py

@@ -0,0 +1,41 @@
+from __future__ import absolute_import
+import sys
+from . import ws2_32
+from . import oleaut32
+
+'''
+A small module for keeping a database of ordinal to symbol
+mappings for DLLs which frequently get linked without symbolic
+infoz.
+'''
+
+ords = {
+    b'ws2_32.dll': ws2_32.ord_names,
+    b'wsock32.dll': ws2_32.ord_names,
+    b'oleaut32.dll': oleaut32.ord_names,
+}
+
+PY3 = sys.version_info > (3,)
+
+if PY3:
+    def formatOrdString(ord_val):
+        return 'ord{}'.format(ord_val).encode()
+else:
+    def formatOrdString(ord_val):
+        return b'ord%d' % ord_val
+
+
+def ordLookup(libname, ord_val, make_name=False):
+    '''
+    Lookup a name for the given ordinal if it's in our
+    database.
+    '''
+    names = ords.get(libname.lower())
+    if names is None:
+        if make_name is True:
+            return formatOrdString(ord_val)
+        return None
+    name = names.get(ord_val)
+    if name is None:
+        return formatOrdString(ord_val)
+    return name