Nuitka-winsvc 2.4.8__tar.gz → 2.4.10__tar.gz

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/Nuitka_winsvc.egg-info/PKG-INFO

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

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/PKG-INFO

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

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/Options.py

@@ -53,6 +53,7 @@ from nuitka.PythonVersions import (
 )
 from nuitka.utils.Execution import getExecutablePath
 from nuitka.utils.FileOperations import (
+    getNormalizedPath,
     isLegalPath,
     isPathExecutable,
     openTextFile,
@@ -121,7 +122,7 @@ def checkPathSpec(value, arg_name, allow_disable):
         )
 
     # This changes the '/' to '\' on Windows at least.
-    value = os.path.normpath(value)
+    value = getNormalizedPath(value)
 
     if "\n" in value or "\r" in value:
         Tracing.options_logger.sysexit(
@@ -1571,7 +1572,7 @@ _shall_use_static_lib_python = None
 
 
 def _shallUseStaticLibPython():
-    # return driven, pylint: disable=too-many-return-statements
+    # many cases and return driven, pylint: disable=too-many-branches,too-many-return-statements
 
     if shallMakeModule():
         return False, "not used in module mode"
@@ -1604,11 +1605,20 @@ def _shallUseStaticLibPython():
 
         # For Anaconda default to trying static lib python library, which
         # normally is just not available or if it is even unusable.
-        if isAnacondaPython() and not isWin32Windows():
-            return (
-                True,
-                "Nuitka on Anaconda needs package for static libpython installed. Execute 'conda install libpython-static'.",
-            )
+        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 isPyenvPython():
             return True, "Nuitka on pyenv should not use '--enable-shared'."

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.4.8
+Nuitka V2.4.10
 Copyright (C) 2024 Kay Hayen."""
 
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/CompiledMethodType.c

@@ -125,7 +125,10 @@ static PyObject *Nuitka_Method_deepcopy(struct Nuitka_MethodObject *method, PyOb
         return NULL;
     }
 
-    return Nuitka_Method_New(method->m_function, object, method->m_class);
+    PyObject *result = Nuitka_Method_New(method->m_function, object, method->m_class);
+    // Nuitka_Method_New took a reference to the object.
+    Py_DECREF(object);
+    return result;
 }
 
 static PyMethodDef Nuitka_Method_methods[] = {

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/HelpersAllocator.c

@@ -673,11 +673,11 @@ void Nuitka_PyObject_GC_Link(PyObject *op) {
     gc->_gc_next = 0;
     gc->_gc_prev = 0;
 
-    gcstate->young.count++;
-    gcstate->heap_size++;
+    gcstate->generations[0].count++;
 
-    if (gcstate->young.count > gcstate->young.threshold && gcstate->enabled && gcstate->young.threshold &&
-        !_Py_atomic_load_int_relaxed(&gcstate->collecting) && !_PyErr_Occurred(tstate)) {
+    if (gcstate->generations[0].count > gcstate->generations[0].threshold && gcstate->enabled &&
+        gcstate->generations[0].threshold && !_Py_atomic_load_int_relaxed(&gcstate->collecting) &&
+        !_PyErr_Occurred(tstate)) {
         Nuitka_Py_ScheduleGC(tstate);
     }
 #endif

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/HelpersComparisonEqUtils.c

@@ -39,6 +39,7 @@ void _initSlotCompare(void) {
     PyDict_SetItem(kw_args, const_str_plain___init__, (PyObject *)Py_TYPE(Py_None));
 
     // Create the type.
+    CHECK_OBJECT(const_str_plain___cmp__);
     PyTypeObject *c = (PyTypeObject *)PyObject_CallFunctionObjArgs((PyObject *)&PyType_Type, const_str_plain___cmp__,
                                                                    pos_args, kw_args, NULL);
     Py_DECREF(pos_args);

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/HelpersConstantsBlob.c

@@ -774,7 +774,9 @@ static unsigned char const *_unpackBlobConstant(PyThreadState *tstate, PyObject
         PyObject *u = PyUnicode_FromStringAndSize((const char *)data, 1);
         data += 1;
 
-#if PYTHON_VERSION >= 0x300
+#if PYTHON_VERSION >= 0x3c7
+        _PyUnicode_InternImmortal(tstate->interp, &u);
+#elif PYTHON_VERSION >= 0x300
         PyUnicode_InternInPlace(&u);
 #else
         insertToDictCache(unicode_cache, &u);
@@ -828,7 +830,9 @@ static unsigned char const *_unpackBlobConstant(PyThreadState *tstate, PyObject
 #endif
         data += size + 1;
 
-#if PYTHON_VERSION >= 0x300
+#if PYTHON_VERSION >= 0x3c7
+        _PyUnicode_InternImmortal(tstate->interp, &u);
+#elif PYTHON_VERSION >= 0x300
         if (c == 'a') {
             PyUnicode_InternInPlace(&u);
         }

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/HelpersMatching.c

@@ -130,7 +130,7 @@ PyObject *MATCH_CLASS_ARGS(PyThreadState *tstate, PyObject *matched, PyObject *m
         if (unlikely(arg_value == NULL)) {
             DROP_ERROR_OCCURRED(tstate);
 
-            Py_DECREF(match_args);
+            Py_XDECREF(match_args);
             Py_DECREF(result);
 
             Py_INCREF_IMMORTAL(Py_None);

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/MainProgram.c

@@ -1114,7 +1114,7 @@ static void changeStandardHandleTarget(FILE *std_handle, filename_char_t const *
 static void Nuitka_at_exit(void) { NUITKA_PRINT_TIMING("Nuitka_at_exit(): Called by C exit()"); }
 #endif
 
-#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAILT)
+#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAULT)
 #include <signal.h>
 static void nuitka_segfault_handler(int sig) {
     puts("Nuitka: A segmentation fault has occurred. This is highly unusual and can");
@@ -1132,6 +1132,11 @@ extern wchar_t const *getBinaryFilenameWideChars(bool resolve_symlinks);
 extern char const *getBinaryFilenameHostEncoded(bool resolve_symlinks);
 #endif
 
+// No longer in header files, but still usable.
+#if PYTHON_VERSION >= 0x3d0
+PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *s);
+#endif
+
 #ifdef _NUITKA_WINMAIN_ENTRY_POINT
 int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpCmdLine, int nCmdShow) {
     /* MSVC, MINGW64 */
@@ -1146,7 +1151,7 @@ int main(int argc, char **argv) {
 #endif
 
     // Installer a segfault handler that outputs a helpful message.
-#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAILT)
+#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAULT)
     signal(SIGSEGV, nuitka_segfault_handler);
 #endif
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/freezer/DependsExe.py

@@ -9,6 +9,7 @@ We use depends.exe to investigate needed DLLs of Python DLLs.
 
 import os
 
+from nuitka.__past__ import WindowsError
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import assumeYesForDownloads
 from nuitka.Tracing import inclusion_logger
@@ -132,7 +133,13 @@ def _parseDependsExeOutput2(lines):
             continue
 
         dll_filename = os.path.abspath(dll_filename)
-        dll_filename = getWindowsLongPathName(dll_filename)
+
+        # Ignore errors trying to resolve the filename. Sometimes Chinese
+        # directory paths do not resolve to long filenames.
+        try:
+            dll_filename = getWindowsLongPathName(dll_filename)
+        except WindowsError:
+            pass
 
         dll_name = os.path.basename(dll_filename)
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/freezer/IncludedDataFiles.py

@@ -35,6 +35,7 @@ from nuitka.utils.FileOperations import (
     getFileList,
     getFilenameExtension,
     getFileSize,
+    getNormalizedPath,
     isFilenameBelowPath,
     isLegalPath,
     isRelativePath,
@@ -98,9 +99,9 @@ class IncludedDataFile(object):
 
         self.kind = kind
         self.source_path = source_path
-        self.dest_path = os.path.normpath(dest_path)
+        self.dest_path = getNormalizedPath(dest_path)
 
-        is_legal, illegal_reason = isLegalPath(dest_path)
+        is_legal, illegal_reason = isLegalPath(self.dest_path)
         if not is_legal:
             general.sysexit(
                 "Error, cannot add data file with '%s' path, as '%s'"

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/freezer/Standalone.py

@@ -32,6 +32,7 @@ from nuitka.PythonFlavors import (
     getHomebrewInstallPath,
     isAnacondaPython,
     isHomebrewPython,
+    isMSYS2MingwPython,
 )
 from nuitka.PythonVersions import getSystemPrefixPath
 from nuitka.Tracing import general, inclusion_logger
@@ -236,6 +237,9 @@ def _reduceToPythonPath(used_dlls):
     if isHomebrewPython():
         inside_paths.insert(0, getHomebrewInstallPath())
 
+    if isMSYS2MingwPython():
+        inside_paths.insert(0, os.path.join(getSystemPrefixPath(), "bin"))
+
     def decideInside(dll_filename):
         return any(
             isFilenameBelowPath(path=inside_path, filename=dll_filename)

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -173,14 +173,17 @@
     - depends:
         - 'apt_pkg'
 
-- module-name: 'arcade' # checksum: 7cb50c0c
+- module-name: 'arcade' # checksum: d7d0718b
   data-files:
     - dirs:
         - 'resources/system'
+    - patterns:
+        - 'VERSION'
   anti-bloat:
     - no-auto-follow:
-        'examples': 'Arcade examples are not be available unless you do "--include-module=acade.examples"'
-        'experimental': 'Experimental features of Arcade will not be available unless you do "--include-module=acade.experimental"'
+        'examples': 'Arcade examples are not available unless you do "--include-module=arcade.examples"'
+        'experimental': 'Experimental features of Arcade will not be available unless you do "--include-module=arcade.experimental"'
+        'future': 'Upcoming features of Arcade will not be available unless you do "--include-module=arcade.future"'
 
 - module-name: 'aspose' # checksum: 1ffc48f1
   data-files:
@@ -1118,18 +1121,18 @@
     - dirs:
         - 'locale/en'
 
-- module-name: 'django.core.management' # checksum: 261e0447
+- module-name: 'django.core.management' # checksum: 18979466
   parameters:
     - 'name': 'settings-module'
       'values': 'checkModuleName(value)'
   variables:
     setup_code:
       - 'import os, importlib'
-      - 'settings = importlib.import_module(os.getenv("PARAMETER_SETTINGS_MODULE"))'
+      - 'settings = importlib.import_module(os.getenv("PARAMETER_SETTINGS_MODULE")) if os.getenv("PARAMETER_SETTINGS_MODULE") else None'
     declarations:
-      'django_installed_apps': 'settings.INSTALLED_APPS'
+      'django_installed_apps': 'settings.INSTALLED_APPS if settings else ()'
     environment:
-      'PARAMETER_SETTINGS_MODULE': 'get_parameter("settings-module", None)'
+      'PARAMETER_SETTINGS_MODULE': 'get_parameter("settings-module", "")'
   anti-bloat:
     # This makes exceptions to the "*" dependency in the
     # implicit-imports section below.
@@ -1178,6 +1181,12 @@
     - depends:
         - 'django.template.loader_tags'
 
+- module-name: 'django.views.debug' # checksum: 466f47d3
+  anti-bloat:
+    - description: 'workaround columns not available from compiled frame execution'
+      replacements_plain:
+        'if PY311:': 'if False:'
+
 - module-name: 'dns.rdtypes' # checksum: 119feab4
   implicit-imports:
     - depends:
@@ -2072,10 +2081,11 @@
     - depends:
         - 'keyring.backends.*'
 
-- module-name: 'keyring.backends.Windows' # checksum: 2531fce0
+- module-name: 'keyring.backends.Windows' # checksum: a414afda
   implicit-imports:
     - depends:
         - 'win32timezone'
+        - 'win32ctypes.core.ctypes.*'
 
 - module-name: 'kivy' # checksum: 648dc799
   data-files:
@@ -3699,6 +3709,12 @@
     - description: 'workaround __new__ decorator issue'
       append_plain: 'SharedRegistryObject.__new__ = staticmethod(SharedRegistryObject.__new__)'
 
+- module-name: 'pip._vendor' # checksum: 49920604
+  anti-bloat:
+    - description: 'allow pydoc inside pip vendored modules'
+      no-auto-follow:
+        'pydoc': 'ignore'
+
 - module-name: 'pip._vendor.rich.jupyter' # checksum: b346e77
   # See rich.jupyter
   anti-bloat:
@@ -3850,6 +3866,11 @@
         - 'plyer.platforms.android.*'
       when: 'android'
 
+- module-name: 'polars' # checksum: d072aa03
+  implicit-imports:
+    - depends:
+        - 'numpy.core.multiarray'
+
 - module-name: 'polars.lazyframe.frame' # checksum: e9afa6bc
   anti-bloat:
     - description: 'remove IPython reference'
@@ -4405,7 +4426,7 @@
     - find-dlls-near-module:
         - 'shiboken2'
 
-- module-name: 'PySide6' # checksum: a87b6b1
+- module-name: 'PySide6' # checksum: 219aba79
   implicit-imports:
     - post-import-code:
         - |
@@ -4458,6 +4479,9 @@
         - 'libquick3dspatialaudioplugin'
         - 'libqtvkbcomponentsplugin'
         - 'libqtvkbsettingsplugin'
+        - 'libqsqlodbc'
+        - 'libpq.5'
+        - 'libffmpegmediaplugin'
 
 - module-name: 'PySide6.QtCore' # checksum: be0d99ac
   implicit-imports:
@@ -6894,6 +6918,16 @@
     - depends:
         - 'tiktoken_ext.*'
 
+- module-name: 'time_machine' # checksum: b038bd8
+  anti-bloat:
+    - description: 'remove pytest reference'
+      no-auto-follow:
+        'pytest': 'ignore'
+      when: 'not use_pytest'
+    - description: 'allow unittest'
+      bloat-mode-overrides:
+        'unittest': 'allow'
+
 - module-name: 'timm.models.hrnet' # checksum: fdbe0e63
   anti-bloat:
     - replacements_plain:
@@ -6991,7 +7025,7 @@
     - include-metadata:
         - 'toga-gtk'
 
-- module-name: 'toga_winforms' # checksum: 378cf0f6
+- module-name: 'toga_winforms' # checksum: 618ee1e0
   data-files:
     - dirs:
         - 'resources'
@@ -6999,16 +7033,31 @@
         - 'toga-winforms'
   dlls:
     - from_filenames:
+        relative_path: 'libs/WebView2/runtimes/win-arm64/native'
+        prefixes:
+          - 'WebView2Loader'
+      when: 'win32 and arch_arm64'
+    - from_filenames: # older toga_winforms only
         relative_path: 'libs/WebView2/arm64'
         prefixes:
           - 'WebView2Loader'
       when: 'win32 and arch_arm64'
     - from_filenames:
+        relative_path: 'libs/WebView2/runtimes/win-x86/native'
+        prefixes:
+          - 'WebView2Loader'
+      when: 'win32 and arch_x86'
+    - from_filenames: # older toga_winforms only
         relative_path: 'libs/WebView2/x86'
         prefixes:
           - 'WebView2Loader'
       when: 'win32 and arch_x86'
     - from_filenames:
+        relative_path: 'libs/WebView2/runtimes/win-x64/native'
+        prefixes:
+          - 'WebView2Loader'
+      when: 'win32 and arch_amd64'
+    - from_filenames: # older toga_winforms only
         relative_path: 'libs/WebView2/x64'
         prefixes:
           - 'WebView2Loader'

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/tools/testing/Common.py

@@ -593,7 +593,7 @@ def snapObjRefCntMap(before):
             k = "str_overload_" + x.__class__.__name__ + str(x)
         elif type(x) is dict:
             if "__builtins__" in x:
-                k = "<module dict %s>" % x["__name__"]
+                k = "<module dict %s>" % x.get("__name__", "<maybe not a module>")
             elif "__spec__" in x and "__name__" in x:
                 k = "<module dict %s>" % x["__name__"]
             else:

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/utils/FileOperations.py

@@ -101,8 +101,8 @@ def areSamePaths(path1, path2):
     if path1 == path2:
         return True
 
-    path1 = os.path.abspath(os.path.normpath(path1))
-    path2 = os.path.abspath(os.path.normpath(path2))
+    path1 = os.path.abspath(getNormalizedPath(path1))
+    path2 = os.path.abspath(getNormalizedPath(path2))
 
     if os.path.exists(path1) and os.path.exists(path2):
         path1 = getExternalUsePath(path1)
@@ -1533,6 +1533,18 @@ def getParentDirectories(path):
         yield path
 
 
+def getNormalizedPath(path):
+    """Return normalized path that is also a native path, i.e. only legal characters.
+
+    Needed, because MSYS2 likes to keep "/" in normalized paths.
+    """
+    path = os.path.normpath(path)
+    if isWin32Windows():
+        path = path.replace("/", "\\")
+
+    return path
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.10}/nuitka/utils/Utils.py

@@ -128,6 +128,22 @@ def getWindowsRelease():
     if not isWin32OrPosixWindows():
         return None
 
+    if isPosixWindows():
+        from .FileOperations import getFileContents
+
+        build_number = int(
+            getFileContents("/proc/version").split(" ")[0].rsplit("-")[-1]
+        )
+
+        if build_number >= 21996:
+            return 11
+        elif build_number >= 10240:
+            return 10
+        elif build_number >= 9200:
+            return 8
+        else:
+            return 7
+
     class OsVersionInfoEx(ctypes.Structure):
         _fields_ = [
             ("dwOSVersionInfoSize", ctypes.c_ulong),