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

nuitka/tools/testing/compare_with_cpython/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Tool to compare output of CPython and Nuitka.
@@ -16,6 +16,7 @@ from nuitka.__past__ import md5
 from nuitka.OptionParsing import getNuitkaProjectOptions
 from nuitka.tools.testing.Common import (
     addToPythonPath,
+    decryptOutput,
     executeAfterTimePassed,
     getDebugPython,
     getTempDir,
@@ -37,6 +38,7 @@ from nuitka.utils.Execution import (
 from nuitka.utils.FileOperations import deleteFile
 from nuitka.utils.Importing import getSharedLibrarySuffix
 from nuitka.utils.Timing import StopWatch
+from nuitka.utils.Utils import isMacOS
 
 
 def displayOutput(stdout, stderr):
@@ -215,7 +217,8 @@ def main():
     expect_success = hasArg("expect_success")
     expect_failure = hasArg("expect_failure")
     python_debug = hasArg("python_debug") or hasArg("--python-debug")
-    module_mode = hasArg("--module")
+    package_mode = hasArg("--mode=package")
+    module_mode = hasArg("--mode=module") or hasArg("--mode=module") or package_mode
     module_entry_point = hasArgValue("--module-entry-point")
     coverage_mode = hasArg("coverage")
     two_step_execution = hasArg("two_step_execution")
@@ -225,8 +228,11 @@ def main():
     )
     remove_output = hasArg("remove_output")
     remove_binary = not hasArg("--keep-binary")
-    standalone_mode = hasArg("--standalone")
-    onefile_mode = hasArg("--onefile")
+    app_bundle_mode = hasArg("--mode=app") and isMacOS()
+    standalone_mode = (
+        hasArg("--standalone") or hasArg("--mode=standalone") or app_bundle_mode
+    )
+    onefile_mode = hasArg("--onefile") or hasArg("--mode=onefile")
     no_site = hasArg("no_site") or coverage_mode
     report = hasArgValue("--report")
     nofollow_imports = hasArg("recurse_none") or hasArg("--nofollow-imports")
@@ -287,11 +293,18 @@ def main():
         )
     )
 
-    if "--standalone" in project_options:
+    if "--standalone" in project_options or "--mode=standalone" in project_options:
         standalone_mode = True
-    if "--onefile" in project_options:
+    if "--onefile" in project_options or "--mode=onefile" in project_options:
         standalone_mode = True
         onefile_mode = True
+    if "--mode=app" in project_options:
+        if isMacOS():
+            standalone_mode = True
+            app_bundle_mode = True
+        else:
+            standalone_mode = True
+            onefile_mode = True
 
     # In coverage mode, we don't want to execute, and to do this only in one mode,
     # we enable two step execution, which splits running the binary from the actual
@@ -535,12 +548,16 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
 
     # Now build the command to run Nuitka.
     if not two_step_execution:
-        if module_mode:
-            extra_options.append("--module")
+        if package_mode:
+            extra_options.append("--mode=package")
+        elif module_mode:
+            extra_options.append("--mode=module")
         elif onefile_mode:
-            extra_options.append("--onefile")
+            extra_options.append("--mode=onefile")
+        elif app_bundle_mode:
+            extra_options.append("--mode=app")
         elif standalone_mode:
-            extra_options.append("--standalone")
+            extra_options.append("--mode=standalone")
 
         nuitka_cmd = nuitka_call + extra_options + ["--run", filename]
 
@@ -548,12 +565,22 @@ Taking coverage of '{filename}' using '{python}' with flags {args} ...""".format
             nuitka_cmd.insert(len(nuitka_cmd) - 1, "--python-flag=-S")
 
     else:
-        if module_mode:
+        if package_mode:
+            nuitka_cmd1 = (
+                nuitka_call
+                + extra_options
+                + ["--mode=package", os.path.abspath(filename)]
+            )
+        elif module_mode:
             nuitka_cmd1 = (
-                nuitka_call + extra_options + ["--module", os.path.abspath(filename)]
+                nuitka_call
+                + extra_options
+                + ["--mode=module", os.path.abspath(filename)]
             )
+        elif onefile_mode:
+            nuitka_cmd1 = nuitka_call + extra_options + ["--mode=onefile", filename]
         elif standalone_mode:
-            nuitka_cmd1 = nuitka_call + extra_options + ["--standalone", filename]
+            nuitka_cmd1 = nuitka_call + extra_options + ["--mode=standalone", filename]
         else:
             nuitka_cmd1 = nuitka_call + extra_options + [filename]
 
@@ -698,7 +725,9 @@ Stderr was:
 
                     # In case of segfault or assertion triggered, run in debugger.
                     if exit_nuitka in (-11, -6) and sys.platform != "nt":
-                        nuitka_cmd2 = wrapCommandForDebuggerForSubprocess(*nuitka_cmd2)
+                        nuitka_cmd2 = wrapCommandForDebuggerForSubprocess(
+                            command=nuitka_cmd2
+                        )
 
                         callProcess(nuitka_cmd2, shell=False)
                 else:
@@ -716,6 +745,14 @@ Stderr was:
     stop_watch.stop()
     nuitka_time = stop_watch.getDelta()
 
+    if "--encrypt-stderr" in project_options:
+        with withPythonPathChange(nuitka_package_dir):
+            stderr_nuitka = decryptOutput(project_options, stderr_nuitka)
+
+    if "--encrypt-stdout" in project_options:
+        with withPythonPathChange(nuitka_package_dir):
+            stdout_nuitka = decryptOutput(project_options, stdout_nuitka)
+
     if not silent_mode:
         displayOutput(stdout_nuitka, stderr_nuitka)
 

nuitka/tools/testing/find_sxs_modules/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """

nuitka/tools/testing/find_sxs_modules/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Tool to compare find SxS using modules.

nuitka/tools/testing/measure_construct_performance/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """

nuitka/tools/testing/measure_construct_performance/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Run a construct based comparison test.

nuitka/tools/testing/run_nuitka_tests/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """

nuitka/tools/testing/run_nuitka_tests/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Main front-end to the tests of Nuitka.

nuitka/tools/watch/AutoStage.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Stage changes in Nuitka-Watch automatically

nuitka/tools/watch/Common.py

@@ -0,0 +1,55 @@
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Shared code for nuitka-watch backends.
+
+"""
+
+import os
+import sys
+
+
+def getPlatformRequirements(installed_python, case_data):
+    requirements = list(case_data["requirements"])
+
+    # Nuitka house keeping, these are from setup.py but we ignore onefile needs
+    # as that is not currently covered in watches.
+    # spell-checker: ignore orderedset,imageio
+    needs_onefile = False
+
+    if installed_python.getHexVersion() >= 0x370:
+        requirements.append("ordered-set >= 4.1.0")
+    if installed_python.getHexVersion() < 0x300:
+        requirements.append("subprocess32")
+    if needs_onefile and installed_python.getHexVersion() >= 0x370:
+        requirements.append("zstandard >= 0.15")
+    if (
+        os.name != "nt"
+        and sys.platform != "darwin"
+        and installed_python.getHexVersion() < 0x370
+    ):
+        requirements.append("orderedset >= 2.0.3")
+    if sys.platform == "darwin" and installed_python.getHexVersion() < 0x370:
+        requirements.append("orderedset >= 2.0.3")
+
+    # For icon conversion.
+    if case_data.get("icons", "no") == "yes":
+        requirements.append("imageio")
+
+    return requirements
+
+
+#     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/tools/watch/Conda.py

@@ -0,0 +1,125 @@
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Conda backend for maintaining locked package state with nuitka-watch. """
+
+from nuitka.utils.Execution import check_call, executeToolChecked
+from nuitka.utils.FileOperations import changeTextFileContents
+from nuitka.utils.Utils import isWin32Windows
+
+from .Common import getPlatformRequirements
+
+
+def _getCaseEnvironmentName(installed_python, case_data):
+    return "nuitka-watch-case-%(python_version)s-%(case)s" % {
+        "python_version": installed_python.getPythonVersion(),
+        "case": case_data["case"],
+    }
+
+
+def getCondaRunCommand(installed_python, case_data):
+    return [
+        "conda",
+        "run",
+        "--live-stream",
+        "-n",
+        _getCaseEnvironmentName(installed_python=installed_python, case_data=case_data),
+        "python",
+    ]
+
+
+# spell-checker: ignore opencv
+_package_name_table = {
+    "dask_ml": "dask-ml",
+    "opencv-python-headless": "opencv",
+    "opencv-python": "opencv",
+}
+
+
+def _translatePyPIPackageName(package_name):
+    for key, value in _package_name_table.items():
+        package_name = package_name.replace(key, value)
+
+    return package_name
+
+
+def updateCondaEnvironmentFile(installed_python, case_data):
+    conda_env_filename = "environment.yml"
+    conda_package_requirements = ["python=%s" % installed_python.getPythonVersion()]
+
+    if not isWin32Windows():
+        conda_package_requirements.append("libpython-static")
+
+    for requirement in getPlatformRequirements(
+        installed_python=installed_python, case_data=case_data
+    ):
+        # Ignore spaces in requirements.
+        requirement = requirement.replace(" ", "")
+
+        # TODO: Ought to work on the package name only, but
+        # we get away with bad code here for now.
+        requirement = _translatePyPIPackageName(requirement)
+
+        conda_package_requirements.append(requirement)
+
+    changeTextFileContents(
+        conda_env_filename,
+        """\
+name: "%(name)s"
+dependencies:
+%(conda_package_requirements)s
+"""
+        % {
+            "name": _getCaseEnvironmentName(
+                installed_python=installed_python, case_data=case_data
+            ),
+            "conda_package_requirements": "\n".join(
+                "  - %s" % conda_package_requirement
+                for conda_package_requirement in conda_package_requirements
+            ),
+        },
+    )
+
+
+def updateCondaEnvironmentLockFile(logger, installed_python, case_data):
+    conda_lock_filename = "environment.lock"
+
+    check_call(
+        ["conda", "env", "update", "-f", "environment.yml", "--prune"],
+        logger=logger,
+    )
+
+    conda_output = executeToolChecked(
+        logger=logger,
+        command=[
+            "conda",
+            "env",
+            "export",
+            "-n",
+            _getCaseEnvironmentName(
+                installed_python=installed_python, case_data=case_data
+            ),
+        ],
+        absence_message="needs conda to query package status on Anaconda Python",
+        decoding=str is not bytes,
+    )
+
+    changeTextFileContents(filename=conda_lock_filename, contents=conda_output)
+
+    return conda_lock_filename
+
+
+#     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/tools/watch/GitHub.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ GitHub interfacing for nuitka-watch. """

nuitka/tools/watch/Pacman.py

@@ -0,0 +1,73 @@
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Pacman backend for maintaining locked package state with nuitka-watch. """
+
+from nuitka.utils.Execution import check_call, executeToolChecked
+from nuitka.utils.FileOperations import changeTextFileContents, openTextFile
+
+from .Common import getPlatformRequirements
+
+
+def updatePacmanFile(installed_python, case_data):
+    pacman_filename = "Pacman.txt"
+    pacman_package_requirements = []
+
+    for requirement in getPlatformRequirements(
+        installed_python=installed_python, case_data=case_data
+    ):
+        # Ignore spaces in requirements.
+        requirement = requirement.replace(" ", "")
+
+        pacman_package_requirements.append(requirement)
+
+    changeTextFileContents(
+        pacman_filename,
+        """\
+%(python_version)s
+%(pacman_package_requirements)s
+"""
+        % {
+            "pacman_package_requirements": "\n".join(pacman_package_requirements),
+            "python_version": installed_python.getPythonVersion(),
+        },
+    )
+
+    return pacman_filename
+
+
+def updatePacmanLockFile(logger):
+    pacman_lock_filename = "Pacman.lock"
+
+    with openTextFile("Pacman.txt", "r") as pacman_env_file:
+        check_call(["pacman", "-S", "-"], stdin=pacman_env_file)
+
+    pacman_output = executeToolChecked(
+        logger=logger,
+        command=["pacman", "-Qe"],
+        absence_message="needs pacman to query package status on MSYS2",
+        decoding=str is not bytes,
+    )
+    pacman_output = "\n".join(
+        line.replace(" ", "=") for line in pacman_output.splitlines()
+    )
+
+    changeTextFileContents(filename=pacman_lock_filename, contents=pacman_output)
+
+    return pacman_lock_filename
+
+
+#     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/tools/watch/Pipenv.py

@@ -0,0 +1,143 @@
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Pipenv backend for maintaining locked package state with nuitka-watch. """
+
+import os
+import subprocess
+
+from nuitka.utils.Execution import check_call
+from nuitka.utils.FileOperations import changeTextFileContents
+
+from .Common import getPlatformRequirements
+
+
+def _execPipenvCommand(logger, installed_python, command, retry=False):
+    try:
+        check_call(
+            [
+                installed_python.getPythonExe(),
+                "-m",
+                "pipenv",
+                command,
+                "--python",
+                installed_python.getPythonExe(),
+            ],
+            logger=logger,
+        )
+    except subprocess.CalledProcessError:
+        if command in ("install", "update") and not retry:
+            _execPipenvCommand(
+                logger=logger, installed_python=installed_python, command="--rm"
+            )
+            _execPipenvCommand(
+                logger=logger, installed_python=installed_python, command=command
+            )
+
+        else:
+            raise
+
+
+def updatePipenvFile(installed_python, case_data):
+    pipenv_filename = "Pipfile"
+    pipenv_package_requirements = []
+
+    for requirement in getPlatformRequirements(
+        installed_python=installed_python, case_data=case_data
+    ):
+        # Ignore spaces in requirements.
+        requirement = requirement.replace(" ", "")
+
+        if all(char not in requirement for char in "=><"):
+            pipenv_package_requirements.append('"%s" = "*"' % requirement)
+        else:
+            operator_index = min(
+                requirement.find(char) for char in "=><" if char in requirement
+            )
+
+            pipenv_package_requirements.append(
+                '"%s" = "%s"'
+                % (requirement[:operator_index], requirement[operator_index:])
+            )
+
+    # TODO: Other indexes, e.g. nvidia might be needed too
+    changeTextFileContents(
+        pipenv_filename,
+        """\
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[requires]
+python_version = "%(python_version)s"
+
+[packages]
+%(pipenv_package_requirements)s
+"""
+        % {
+            "pipenv_package_requirements": "\n".join(pipenv_package_requirements),
+            "python_version": installed_python.getPythonVersion(),
+        },
+    )
+
+    return pipenv_filename
+
+
+def updatePipenvLockFile(
+    logger, installed_python, pipenv_filename_full, no_pipenv_update
+):
+    if os.path.exists("Pipfile.lock"):
+        if no_pipenv_update:
+            logger.info(
+                "Keeping existing lock file with pipenv file '%s'."
+                % pipenv_filename_full
+            )
+
+            _execPipenvCommand(
+                logger=logger, installed_python=installed_python, command="install"
+            )
+
+        else:
+            logger.info(
+                "Working with existing pipenv file '%s' to update virtualenv, may take a while."
+                % pipenv_filename_full
+            )
+
+            _execPipenvCommand(
+                logger=logger, installed_python=installed_python, command="update"
+            )
+    else:
+        logger.info(
+            "Working with pipenv file '%s' to install virtualenv, may take a while."
+            % pipenv_filename_full
+        )
+
+        check_call(
+            [
+                installed_python.getPythonExe(),
+                "-m",
+                "pipenv",
+                "install",
+                "--python",
+                installed_python.getPythonExe(),
+            ]
+        )
+
+    return "Pipfile.lock"
+
+
+#     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/tools/watch/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """