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

nuitka/tools/environments/Virtualenv.py

@@ -1,32 +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
+
+
 """ Creating virtualenvs and running commands in them.
 
 """
 
-
 import os
 import sys
 from contextlib import contextmanager
 
 from nuitka.__past__ import unicode
-from nuitka.Tracing import my_print
-from nuitka.utils.Execution import check_call, executeProcess
+from nuitka.utils.Execution import (
+    NuitkaCalledProcessError,
+    check_call,
+    executeProcess,
+    withEnvironmentVarsOverridden,
+)
 from nuitka.utils.FileOperations import (
     getDirectoryRealPath,
     removeDirectory,
@@ -35,10 +24,11 @@ from nuitka.utils.FileOperations import (
 
 
 class Virtualenv(object):
-    def __init__(self, env_dir):
+    def __init__(self, env_dir, logger):
         self.env_dir = os.path.abspath(env_dir)
+        self.logger = logger
 
-    def runCommand(self, commands, style=None):
+    def runCommand(self, commands, env=None, style=None):
         if type(commands) in (str, unicode):
             commands = [commands]
 
@@ -51,9 +41,18 @@ class Virtualenv(object):
             command = " && ".join(commands)
 
             if style is not None:
-                my_print("Executing: %s" % command, style=style)
+                self.logger.info("Executing: %s" % command, style=style)
+
+            with withEnvironmentVarsOverridden(env):
+                exit_code = os.system(command)
+                if exit_code != 0:
+                    self.logger.info(
+                        "Failure %s for: %s" % (exit_code, command), style=style
+                    )
 
-            assert os.system(command) == 0, command
+                    raise NuitkaCalledProcessError(
+                        exit_code, command, output=None, stderr=None
+                    )
 
     def runCommandWithOutput(self, commands, style=None):
         """
@@ -72,7 +71,7 @@ class Virtualenv(object):
             command = " && ".join(commands)
 
             if style is not None:
-                my_print("Executing: %s" % command, style=style)
+                self.logger.info("Executing: %s" % command, style=style)
 
             # Use subprocess and also return outputs, stdout, stderr, result
             return executeProcess(
@@ -85,14 +84,16 @@ class Virtualenv(object):
 
 
 @contextmanager
-def withVirtualenv(env_name, base_dir=None, python=None, delete=True, style=None):
+def withVirtualenv(
+    env_name, logger, base_dir=None, python=None, delete=True, style=None
+):
     """Create a virtualenv and change into it.
 
     Activating for actual use will be your task.
     """
 
     if style is not None:
-        my_print("Creating a virtualenv:")
+        logger.info("Creating a virtualenv:")
 
     if python is None:
         python = sys.executable
@@ -108,15 +109,42 @@ def withVirtualenv(env_name, base_dir=None, python=None, delete=True, style=None
     else:
         env_dir = env_name
 
-    removeDirectory(env_dir, ignore_errors=False)
+    removeDirectory(
+        env_dir,
+        logger=logger,
+        ignore_errors=False,
+        extra_recommendation=None,
+    )
 
     with withDirectoryChange(base_dir, allow_none=True):
         command = [python, "-m", "virtualenv", env_name]
         if style is not None:
-            my_print("Executing: %s" % " ".join(command), style=style)
+            logger.info("Executing: %s" % " ".join(command), style=style)
         check_call(command)
 
-        yield Virtualenv(env_dir)
+    try:
+        yield Virtualenv(env_dir, logger=logger)
+    finally:
+        if delete:
+            removeDirectory(
+                env_dir,
+                logger=logger,
+                ignore_errors=False,
+                extra_recommendation=None,
+            )
+
 
-    if delete:
-        removeDirectory(env_dir, ignore_errors=False)
+#     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/environments/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/general/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/general/dll_report/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """

nuitka/tools/general/dll_report/__main__.py

@@ -1,21 +1,6 @@
 #!/usr/bin/env python
-#     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
+
 
 """ Main program for DLL checker tool.
 
@@ -26,9 +11,7 @@ import sys
 import tempfile
 from optparse import OptionParser
 
-from nuitka.freezer.DllDependenciesWin32 import (
-    detectBinaryPathDLLsWindowsDependencyWalker,
-)
+from nuitka.freezer.DllDependenciesWin32 import detectBinaryPathDLLsWin32
 from nuitka.Tracing import my_print
 from nuitka.utils.SharedLibraries import getDLLVersion, getSxsFromDLL
 from nuitka.utils.Timing import TimerReport
@@ -37,7 +20,15 @@ from nuitka.utils.Timing import TimerReport
 def main():
     parser = OptionParser()
 
-    _options, positional_args = parser.parse_args()
+    parser.add_option(
+        "--no-use-path",
+        action="store_false",
+        dest="use_path",
+        default=True,
+        help="""Do NOT use PATH to locate DLL dependencies.""",
+    )
+
+    options, positional_args = parser.parse_args()
 
     if not positional_args:
         sys.exit("No DLLs given.")
@@ -56,12 +47,13 @@ def main():
         with TimerReport(
             message="Finding dependencies for %s took %%.2f seconds" % filename
         ):
-            r = detectBinaryPathDLLsWindowsDependencyWalker(
+            r = detectBinaryPathDLLsWin32(
                 is_main_executable=False,
                 source_dir=tempfile.gettempdir(),
                 original_dir=os.path.dirname(filename),
                 binary_filename=filename,
                 package_name=None,
+                use_path=options.use_path,
                 use_cache=False,
                 update_cache=False,
             )
@@ -74,3 +66,18 @@ def main():
 
 if __name__ == "__main__":
     main()
+
+#     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/general/find_module/FindModuleCode.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
+
+
 """ Find module code and open it in Visual Code.
 
 The idea is that this can be used during development, to accept module names,
@@ -34,6 +20,7 @@ from nuitka.importing.Importing import (
 from nuitka.Tracing import tools_logger
 from nuitka.utils.Execution import callProcess, getExecutablePath
 from nuitka.utils.FileOperations import relpath
+from nuitka.utils.Importing import getPackageDirFilename
 from nuitka.utils.Utils import isWin32Windows
 
 
@@ -58,6 +45,7 @@ def editModuleCode(module_search_desc):
 
             candidate = module_search_desc
 
+            # spell-checker: ignore ONEFIL
             while not candidate.endswith(".DIS") and not os.path.basename(
                 candidate
             ).startswith("ONEFIL"):
@@ -75,14 +63,23 @@ def editModuleCode(module_search_desc):
 
             candidate = module_search_desc
 
-            while not candidate.endswith(".dist"):
+            while not candidate.endswith(".dist") and candidate:
                 candidate = os.path.dirname(candidate)
 
-            module_name = relpath(module_search_desc, start=candidate).replace("/", ".")
+            if candidate:
+                module_name = relpath(module_search_desc, start=candidate).replace(
+                    "/", "."
+                )
+            else:
+                module_name = None
     else:
         module_name = ModuleName(module_search_desc)
 
-    if module_name is not None:
+    if module_name is None:
+        tools_logger.sysexit(
+            "Error, did not find module for '%s' " % module_search_desc
+        )
+    else:
         addMainScriptDirectory(os.getcwd())
         module_filename = findModuleCode(module_name)
 
@@ -90,9 +87,9 @@ def editModuleCode(module_search_desc):
         tools_logger.sysexit("Error, did not find '%s' module" % module_name)
     else:
         if os.path.isdir(module_filename):
-            candidate = os.path.join(module_filename, ("__init__.py"))
+            candidate = getPackageDirFilename(module_filename)
 
-            if os.path.isfile(candidate):
+            if candidate is not None:
                 module_filename = candidate
 
         if os.path.isdir(module_filename):
@@ -109,3 +106,19 @@ def editModuleCode(module_search_desc):
 
         if visual_code_binary:
             callProcess([visual_code_binary, module_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/general/find_module/__init__.py

@@ -1,5 +1,8 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Dummy file to make this directory a package. """
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #
@@ -14,5 +17,3 @@
 #     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.
-#
-""" Dummy file to make this directory a package. """