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

nuitka/plugins/standard/MatplotlibPlugin.py

@@ -1,31 +1,21 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Matplotlib standard plugin module. """
+
 import os
 
 from nuitka.Options import isStandaloneMode
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 from nuitka.plugins.Plugins import (
+    getActiveQtPlugin,
     getActiveQtPluginBindingName,
     hasActivePlugin,
 )
+from nuitka.utils.Execution import NuitkaCalledProcessError
 from nuitka.utils.FileOperations import getFileContentByLine
 from nuitka.utils.Jinja2 import renderTemplateFromString
+from nuitka.utils.Utils import isMacOS
 
 # spell-checker: ignore matplotlib, scipy, scikit, matplotlibrc, matplotlibdata
 # spell-checker: ignore mpl_toolkits, tkagg, MPLBACKEND
@@ -68,9 +58,10 @@ class NuitkaPluginMatplotlib(NuitkaPluginBase):
             There might exist a local version outside 'matplotlib/mpl-data' which
             we then must use instead. Determine its name by asking matplotlib.
         """
-        info = self.queryRuntimeInformationMultiple(
-            info_name="matplotlib_info",
-            setup_codes="""
+        try:
+            info = self.queryRuntimeInformationMultiple(
+                info_name="matplotlib_info",
+                setup_codes="""
 from matplotlib import matplotlib_fname, get_backend, __version__
 try:
     from matplotlib import get_data_path
@@ -78,23 +69,53 @@ except ImportError:
     from matplotlib import _get_data_path as get_data_path
 from inspect import getsource
 """,
-            values=(
-                ("matplotlibrc_filename", "matplotlib_fname()"),
-                ("backend", "get_backend()"),
-                ("data_path", "get_data_path()"),
-                ("matplotlib_version", "__version__"),
-                (
-                    "needs_matplotlibdata_env",
-                    "'MATPLOTLIBDATA' in getsource(get_data_path) or 'MATPLOTLIBRC' in getsource(get_data_path)",
+                values=(
+                    ("matplotlibrc_filename", "matplotlib_fname()"),
+                    ("backend", "get_backend()"),
+                    ("data_path", "get_data_path()"),
+                    ("matplotlib_version", "__version__"),
                 ),
-            ),
-        )
+            )
+        except NuitkaCalledProcessError as e:
+            self.debug("Exception during detection: %s" % str(e))
+
+            if "MPLBACKEND" not in os.environ:
+                self.sysexit(
+                    """\
+Error, failed to detect matplotlib backend. Please set 'MPLBACKEND' \
+environment variable during compilation.""",
+                    mnemonic="""\
+https://matplotlib.org/stable/users/installing/environment_variables_faq.html#envvar-MPLBACKEND""",
+                )
+
+            raise
 
         if info is None:
             self.sysexit("Error, it seems 'matplotlib' is not installed or broken.")
 
+        # Auto correct for using tk-inter the system setting.
+        if "tk" not in info.backend.lower() and hasActivePlugin("tk-inter"):
+            info = info.replace(backend="TkAgg")
+
+        if info.backend == "QtAgg" and getActiveQtPlugin() is None:
+            self.sysexit(
+                "Error, cannot use 'QtAgg' with not plugin for Qt binding active."
+            )
+
         return info
 
+    def getImplicitImports(self, module):
+        # Make sure the used Qt namespace is included in compilation, mostly for
+        # accelerated mode, but also to prevent people from accidentally
+        # removing it.
+        if module.getFullName() != "matplotlib":
+            return
+
+        matplotlib_info = self._getMatplotlibInfo()
+
+        # Make sure, the default backend is included.
+        yield "matplotlib.backends.backend_%s" % matplotlib_info.backend.lower()
+
     def considerDataFiles(self, module):
         if module.getFullName() != "matplotlib":
             return
@@ -106,6 +127,18 @@ from inspect import getsource
                 "mpl-data missing, matplotlib installation appears to be broken"
             )
 
+        self.info(
+            "Using %s backend '%s'."
+            % (
+                (
+                    "configuration file or default"
+                    if "MPLBACKEND" not in os.environ
+                    else "as per 'MPLBACKEND' environment variable"
+                ),
+                matplotlib_info.backend,
+            )
+        )
+
         # Include the "mpl-data" files.
         yield self.makeIncludedDataDirectory(
             source_path=matplotlib_info.data_path,
@@ -133,7 +166,7 @@ from inspect import getsource
                 # old config file has a backend definition
                 found = True
 
-        if not found and matplotlib_info.matplotlib_version < "3":
+        if not found and matplotlib_info.matplotlib_version < "4":
             # Set the backend, so even if it was run time determined, we now enforce it.
             new_lines.append("backend: %s" % matplotlib_info.backend)
 
@@ -152,14 +185,19 @@ from inspect import getsource
         # some special handling for matplotlib:
         # depending on whether 'tk-inter' resp. 'qt-plugins' are enabled,
         # their matplotlib backends are included.
-        if hasActivePlugin("tk-inter"):
-            if module_name in (
-                "matplotlib.backends.backend_tk",
-                "matplotlib.backends.backend_tkagg",
-                "matplotlib.backend.tkagg",
-            ):
+        if module_name in (
+            "matplotlib.backends.backend_tk",
+            "matplotlib.backends.backend_tkagg",
+            "matplotlib.backend.tkagg",
+        ):
+            if hasActivePlugin("tk-inter"):
                 return True, "Needed for tkinter matplotlib backend"
 
+        # For Qt binding, include matplotlib backend, spell-checker: ignore qtagg
+        if module_name == "matplotlib.backends.backend_qtagg":
+            if getActiveQtPluginBindingName() is not None:
+                return True, "Needed for qt matplotlib backend"
+
     def createPreModuleLoadCode(self, module):
         """Method called when a module is being imported.
 
@@ -175,16 +213,13 @@ from inspect import getsource
         """
 
         # The version may not need the environment variable.
-        if (
-            module.getFullName() == "matplotlib"
-            and self._getMatplotlibInfo().needs_matplotlibdata_env
-        ):
+        if module.getFullName() == "matplotlib":
             code = renderTemplateFromString(
                 r"""
 import os
 os.environ["MATPLOTLIBDATA"] = os.path.join(__nuitka_binary_dir, "matplotlib", "mpl-data")
 os.environ["MATPLOTLIBRC"] = os.path.join(__nuitka_binary_dir, "matplotlib", "mpl-data", "matplotlibrc")
-os.environ["MPLBACKEND"] = {{matplotlib_info.backend}}
+os.environ["MPLBACKEND"] = "{{matplotlib_info.backend}}"
 {% if qt_binding_name %}
 os.environ["QT_API"] = "{{qt_binding_name}}"
 {% endif %}
@@ -196,3 +231,25 @@ os.environ["QT_API"] = "{{qt_binding_name}}"
                 code,
                 "Setting environment variables for 'matplotlib' to find package configuration.",
             )
+
+    def decideCompilation(self, module_name):
+        # The C code for macOS requires Python functions rather than compiled
+        # ones, let it have its way
+        if isMacOS() and module_name == "matplotlib.backend_bases":
+            return "bytecode"
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/MultiprocessingPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Standard plug-in to make multiprocessing and joblib work well.
 
 On Windows, the multiprocessing modules forks new processes which then have
@@ -23,7 +9,7 @@ point to a "Python.exe" and won't use compiled code by default.
 
 The issue applies to accelerated and standalone mode alike.
 
-spell-checker: ignore joblib
+spell-checker: ignore joblib,anyio
 """
 
 from nuitka import Options
@@ -65,28 +51,21 @@ class NuitkaPluginMultiprocessingWorkarounds(NuitkaPluginBase):
     def createPreModuleLoadCode(module):
         full_name = module.getFullName()
 
-        # TODO: Replace the setting of "sys.frozen" with a change to the source code of the
-        # modules we want to affect from this plugin, it's a huge impact on compatibility
-        # with other things potentially. We should do it, once the anti-bloat engine is
-        # re-usable or supports conditional replacements based on plugin activity and is
-        # always on.
-        if full_name == "multiprocessing":
-            code = """\
+        if full_name in ("multiprocessing", "anyio"):
+            yield (
+                """\
 import sys, os
-sys.frozen = 1
 argv0 = sys.argv[0]
 if sys.platform == "win32" and not os.path.exists(argv0) and not argv0.endswith(".exe"):
     argv0 += ".exe"
 
 sys.executable = %s
 sys._base_executable = sys.executable
-""" % (
-                "__nuitka_binary_exe" if Options.isStandaloneMode() else "argv0"
-            )
-            return (
-                code,
+"""
+                % ("__nuitka_binary_exe" if Options.isStandaloneMode() else "argv0"),
                 """\
-Monkey patching "multiprocessing" load environment.""",
+Monkey patching "%s" load environment."""
+                % full_name,
             )
 
     @staticmethod
@@ -94,7 +73,8 @@ Monkey patching "multiprocessing" load environment.""",
         full_name = module.getFullName()
 
         if full_name == "multiprocessing":
-            code = """\
+            yield (
+                """\
 try:
     from multiprocessing.forking import ForkingPickler
 except ImportError:
@@ -113,10 +93,7 @@ def _reduce_compiled_method(m):
 ForkingPickler.register(type(C().f), _reduce_compiled_method)
 if str is bytes:
     ForkingPickler.register(type(C.f), _reduce_compiled_method)
-"""
-
-            return (
-                code,
+""",
                 """\
 Monkey patching "multiprocessing" for compiled methods.""",
             )
@@ -138,10 +115,10 @@ Monkey patching "multiprocessing" for compiled methods.""",
 
         # For the call stack, this may look bad or different to what CPython
         # does, but such is life. The forking module was split up into multiple
-        # modules in Python 3.4 so this is doubled. TODO: Move the version check
+        # modules in Python3 so this is doubled. TODO: Move the version check
         # into the code and let Nuitka compile time optimize it, which will also
         # make sure joblib support is there for Python2 as well.
-        if python_version >= 0x340:
+        if python_version >= 0x300:
             source_code += """
 def __nuitka_freeze_support():
     import sys
@@ -166,6 +143,9 @@ def __nuitka_freeze_support():
         else:
             kwds[name] = int(value)
 
+    # Otherwise main module names will not work.
+    sys.modules["__main__"] = sys.modules["__parents_main__"]
+
     multiprocessing.spawn.spawn_main(*args, **kwds)
 __nuitka_freeze_support()
 """
@@ -200,3 +180,19 @@ __import__("multiprocessing.forking").forking.freeze_support()"""
     def getPreprocessorSymbols():
         if getModuleInclusionInfoByName("__parents_main__"):
             return {"_NUITKA_PLUGIN_MULTIPROCESSING_ENABLED": "1"}
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/NumpyPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Details see below in class definition.
 """
 
@@ -30,3 +16,19 @@ class NuitkaPluginNumpy(NuitkaPluginBase):
     @classmethod
     def isDeprecated(cls):
         return True
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Standard plug-in to tell user about needed or useful options for packages.
 
 When certain GUI packages are used, disabling the console may or may not be what
@@ -25,25 +11,19 @@ console is disabled. This reads Yaml configuration.
 from nuitka.Options import (
     isOnefileMode,
     isStandaloneMode,
-    mayDisableConsoleWindow,
     shallCreateAppBundle,
-    shallDisableConsoleWindow,
 )
-from nuitka.plugins.PluginBase import NuitkaPluginBase
+from nuitka.plugins.YamlPluginBase import NuitkaYamlPluginBase
 from nuitka.utils.Utils import isMacOS
-from nuitka.utils.Yaml import getYamlPackageConfiguration
 
 
-class NuitkaPluginOptionsNanny(NuitkaPluginBase):
+class NuitkaPluginOptionsNanny(NuitkaYamlPluginBase):
     plugin_name = "options-nanny"
 
     plugin_desc = (
         "Inform the user about potential problems as per package configuration files."
     )
 
-    def __init__(self):
-        self.config = getYamlPackageConfiguration()
-
     @staticmethod
     def isAlwaysEnabled():
         return True
@@ -59,23 +39,28 @@ class NuitkaPluginOptionsNanny(NuitkaPluginBase):
         if support_info == "ignore":
             return
 
-        if condition != "True":
-            problem_desc = (
-                "incomplete support due to not passing condition %s" % condition
-            )
+        if support_info == "parameter":
+            message = "Module has parameter: " + description
+        elif support_info == "plugin":
+            message = "Module has plugin consideration: " + description
         else:
-            problem_desc = "incomplete support"
-
-        message = "Using module '%s' (version %s) with %s: %s" % (
-            full_name,
-            ".".join(str(d) for d in self.getPackageVersion(full_name)),
-            problem_desc,
-            description,
-        )
+            if condition != "True":
+                problem_desc = (
+                    " with incomplete support due to condition '%s'" % condition
+                )
+            else:
+                problem_desc = " with incomplete support"
+
+            message = "Using module '%s' (version %s)%s: %s" % (
+                full_name,
+                ".".join(str(d) for d in self.getPackageVersion(full_name)),
+                problem_desc,
+                description,
+            )
 
         if support_info == "error":
             self.sysexit(message)
-        elif support_info == "warning":
+        elif support_info in ("warning", "parameter", "plugin"):
             self.warning(message)
         elif support_info == "info":
             self.info(message)
@@ -85,36 +70,6 @@ class NuitkaPluginOptionsNanny(NuitkaPluginBase):
                 % full_name.asString()
             )
 
-    def _checkConsoleMode(self, full_name, console):
-        if console == "no":
-            if shallDisableConsoleWindow() is not True:
-                self.sysexit(
-                    "Error, when using '%s', you have to use '--disable-console' option."
-                    % full_name
-                )
-        elif console == "yes":
-            pass
-        elif console == "recommend":
-            if shallDisableConsoleWindow() is None:
-                if isMacOS():
-                    downside_message = """\
-Otherwise high resolution will not be available and a terminal window will open"""
-                else:
-                    downside_message = """\
-Otherwise a terminal window will open"""
-
-                self.info(
-                    """\
-Note, when using '%s', consider using '--disable-console' option. %s. However for \
-debugging, terminal output is the easiest way to see informative traceback \
-and error information, so delay this until your program working and remove \
-once you find it non-working."""
-                    % (full_name, downside_message)
-                )
-
-        else:
-            self.sysexitIllegalOptionValue(full_name, "console", console)
-
     def _checkMacOSBundleMode(self, full_name, macos_bundle):
         if macos_bundle == "yes":
             if isStandaloneMode() and not shallCreateAppBundle():
@@ -126,8 +81,15 @@ Error, package '%s' requires '--macos-create-app-bundle' to be used or else it c
         elif macos_bundle == "no":
             pass
         elif macos_bundle == "recommend":
-            # TODO: Not really recommending with a message it yet.
-            pass
+            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
+            )
         else:
             self.sysexitIllegalOptionValue(full_name, "macos_bundle", macos_bundle)
 
@@ -163,12 +125,6 @@ Error, package '%s' requires '--onefile' to be used on top of '--macos-create-ap
                         condition=condition,
                     )
 
-                    if mayDisableConsoleWindow():
-                        self._checkConsoleMode(
-                            full_name=full_name,
-                            console=check.get("console", "yes"),
-                        )
-
                     if isMacOS():
                         self._checkMacOSBundleMode(
                             full_name=full_name,
@@ -183,3 +139,19 @@ Error, package '%s' requires '--onefile' to be used on top of '--macos-create-ap
                         )
 
         return ()
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/PbrPlugin.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Standard plug-in to make pbr module work when compiled.
 
 The pbr module needs to find a version number in compiled mode. The value
@@ -47,9 +33,9 @@ class NuitkaPluginPbrWorkarounds(NuitkaPluginBase):
         if full_name == "pbr.packaging":
             code = """\
 import os
-version = os.environ.get(
+version = os.getenv(
         "PBR_VERSION",
-        os.environ.get("OSLO_PACKAGE_VERSION"))
+        os.getenv("OSLO_PACKAGE_VERSION"))
 if not version:
     os.environ["OSLO_PACKAGE_VERSION"] = "1.0"
 """
@@ -58,3 +44,19 @@ if not version:
                 """\
 Monkey patching "pbr" version number.""",
             )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.