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

nuitka/tools/testing/Common.py

@@ -7,7 +7,6 @@ import ast
 import atexit
 import gc
 import os
-import re
 import shutil
 import signal
 import sys
@@ -18,6 +17,7 @@ from contextlib import contextmanager
 from optparse import OptionParser
 
 from nuitka.__past__ import md5, subprocess
+from nuitka.Options import getCommercialVersion
 from nuitka.PythonVersions import getTestExecutionPythonVersions, isDebugPython
 from nuitka.Tracing import OurLogger, my_print
 from nuitka.tree.SourceHandling import readSourceCodeFromFilename
@@ -228,8 +228,9 @@ def convertUsing2to3(path, force=False):
 
     if not force:
         if "xrange" not in getFileContents(path):
-            if check_result(command, stderr=getNullOutput()):
-                return path, False
+            with getNullOutput() as null_output:
+                if check_result(command, stderr=null_output):
+                    return path, False
 
     filename = os.path.basename(path)
 
@@ -258,16 +259,17 @@ def convertUsing2to3(path, force=False):
 
     command += ("-w", "-n", "--no-diffs", new_path)
 
-    try:
-        check_output(command, stderr=getNullOutput())
+    with getNullOutput() as null_output:
+        try:
+            check_output(command, stderr=null_output)
 
-    except subprocess.CalledProcessError:
-        if isWin32Windows():
-            raise
+        except subprocess.CalledProcessError:
+            if isWin32Windows():
+                raise
 
-        command[0:3] = ["2to3"]
+            command[0:3] = ["2to3"]
 
-        check_output(command, stderr=getNullOutput())
+            check_output(command, stderr=null_output)
 
     data = getFileContents(new_path)
 
@@ -297,6 +299,10 @@ def decideFilenameVersionSkip(filename):
 
     assert type(filename) is str, repr(filename)
 
+    # There are commercial only test cases
+    if "commercial" in filename.lower() and getCommercialVersion() is None:
+        return False
+
     # Skip runner scripts by default.
     if filename.startswith("run_"):
         return False
@@ -364,11 +370,11 @@ def decideFilenameVersionSkip(filename):
     if filename.endswith("312.py") and _python_version < (3, 12):
         return False
 
-    return True
-
+    # Skip tests that require Python 3.13 at least.
+    if filename.endswith("313.py") and _python_version < (3, 13):
+        return False
 
-def decideNeeds2to3(filename):
-    return _python_version >= (3,) and not re.match(r".*3\d+\.py", filename)
+    return True
 
 
 def _removeCPythonTestSuiteDir():
@@ -395,9 +401,7 @@ def _removeCPythonTestSuiteDir():
             raise
 
 
-def compareWithCPython(
-    dirname, filename, extra_flags, search_mode, needs_2to3, on_error=None
-):
+def compareWithCPython(dirname, filename, extra_flags, search_mode, on_error=None):
     """Call the comparison tool. For a given directory filename.
 
     The search mode decides if the test case aborts on error or gets extra
@@ -405,19 +409,11 @@ def compareWithCPython(
 
     """
 
-    # Many cases to consider here, pylint: disable=too-many-branches
-
     if dirname is None:
         path = filename
     else:
         path = os.path.join(dirname, filename)
 
-    # Apply 2to3 conversion if necessary.
-    if needs_2to3:
-        path, converted = convertUsing2to3(path)
-    else:
-        converted = False
-
     if os.getenv("NUITKA_TEST_INSTALLED", "") == "1":
         command = [
             sys.executable,
@@ -455,9 +451,6 @@ def compareWithCPython(
 
         search_mode.onErrorDetected("Error exit! %s" % result)
 
-    if converted:
-        os.unlink(path)
-
     if result == 2:
         test_logger.sysexit("Interrupted, with CTRL-C\n", exit_code=2)
 
@@ -545,11 +538,12 @@ def displayRuntimeTraces(logger, path):
 
 
 def hasModule(module_name):
-    result = subprocess.call(
-        (os.environ["PYTHON"], "-c", "import %s" % module_name),
-        stdout=getNullOutput(),
-        stderr=subprocess.STDOUT,
-    )
+    with getNullOutput() as null_output:
+        result = subprocess.call(
+            (os.environ["PYTHON"], "-c", "import %s" % module_name),
+            stdout=null_output,
+            stderr=subprocess.STDOUT,
+        )
 
     return result == 0
 
@@ -769,6 +763,14 @@ Execute only tests matching the pattern. Defaults to all tests.""",
         help="""\
 Execute all tests, continue execution even after failure of one.""",
     )
+    select_group.add_option(
+        "--jobs",
+        action="store",
+        dest="jobs",
+        default=None,
+        help="""\
+Pass this as the --jobs value to Nuitka.""",
+    )
 
     del select_group
 
@@ -800,6 +802,9 @@ Defaults to off.""",
     if options.debug:
         addExtendedExtraOptions("--debug")
 
+    if options.jobs is not None:
+        addExtendedExtraOptions("--jobs=%s" % options.jobs)
+
     if options.show_commands:
         os.environ["NUITKA_TRACE_COMMANDS"] = "1"
 
@@ -873,20 +878,19 @@ def executeReferenceChecked(
             continue
 
         # Avoid non-raisable output.
-        try:
-            if number in tests_stderr:
-                sys.stderr = getNullOutput()
-        except OSError:  # Windows
-            if not checkReferenceCount(names[name], explain=explain):
-                result = False
-        else:
-            if not checkReferenceCount(names[name], explain=explain):
-                result = False
-
-            if number in tests_stderr:
-                new_stderr = sys.stderr
-                sys.stderr = old_stderr
-                new_stderr.close()
+        with getNullOutput() as null_output:
+            try:
+                if number in tests_stderr:
+                    sys.stderr = null_output
+            except OSError:  # Windows
+                if not checkReferenceCount(names[name], explain=explain):
+                    result = False
+            else:
+                if not checkReferenceCount(names[name], explain=explain):
+                    result = False
+            finally:
+                if number in tests_stderr:
+                    sys.stderr = old_stderr
 
     gc.enable()
     return result
@@ -1272,12 +1276,13 @@ def setupCacheHashSalt(test_code_path):
     if os.path.exists(os.path.join(test_code_path, ".git")):
         git_cmd = ["git", "ls-tree", "-r", "HEAD", test_code_path]
 
-        process = subprocess.Popen(
-            args=git_cmd,
-            stdin=getNullInput(),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
+        with getNullInput() as null_input:
+            process = subprocess.Popen(
+                args=git_cmd,
+                stdin=null_input,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
 
         stdout_git, stderr_git = process.communicate()
         assert process.returncode == 0, stderr_git
@@ -1346,15 +1351,17 @@ def checkTestRequirements(filename):
         if line.startswith("# nuitka-skip-unless-"):
             if line[21:33] == "expression: ":
                 expression = line[33:]
-                result = subprocess.call(
-                    (
-                        os.environ["PYTHON"],
-                        "-c",
-                        "import sys, os; sys.exit(not bool(%s))" % expression,
-                    ),
-                    stdout=getNullOutput(),
-                    stderr=subprocess.STDOUT,
-                )
+
+                with getNullOutput() as null_output:
+                    result = subprocess.call(
+                        (
+                            os.environ["PYTHON"],
+                            "-c",
+                            "import sys, os; sys.exit(not bool(%s))" % expression,
+                        ),
+                        stdout=null_output,
+                        stderr=subprocess.STDOUT,
+                    )
                 if result != 0:
                     return (False, "Expression '%s' evaluated to false" % expression)
 

nuitka/tools/testing/compare_with_cpython/__main__.py

@@ -322,7 +322,9 @@ def main():
 
     extra_options = os.getenv("NUITKA_EXTRA_OPTIONS", "").split()
 
-    if os.path.normcase(os.environ["PYTHON"]).endswith(("-dbg", "-debug", "_d.exe")):
+    if os.path.normcase(os.environ["PYTHON"]).endswith(
+        ("-dbg", "-debug", "d", "_d.exe")
+    ):
         python_debug = True
     elif "--python-debug" in extra_options or "--python-dbg" in extra_options:
         python_debug = True

nuitka/tools/testing/measure_construct_performance/__main__.py

@@ -17,8 +17,6 @@ from optparse import OptionParser
 from nuitka.__past__ import md5
 from nuitka.tools.testing.Common import (
     check_output,
-    convertUsing2to3,
-    decideNeeds2to3,
     getPythonSysPath,
     getPythonVersionString,
     getTempDir,
@@ -98,8 +96,6 @@ def main():
     my_print("PYTHON_BINARY='%s'" % os.environ["PYTHON"])
     my_print("TEST_CASE_HASH='%s'" % md5(getFileContents(test_case, "rb")).hexdigest())
 
-    needs_2to3 = decideNeeds2to3(test_case)
-
     if options.target_dir:
         copyFile(
             test_case, os.path.join(options.target_dir, os.path.basename(test_case))
@@ -116,10 +112,6 @@ def main():
     putTextFileContents(test_case_1, case_1_source)
     putTextFileContents(test_case_2, case_2_source)
 
-    if needs_2to3:
-        test_case_1, _needs_delete = convertUsing2to3(test_case_1)
-        test_case_2, _needs_delete = convertUsing2to3(test_case_2)
-
     os.environ["PYTHONHASHSEED"] = "0"
 
     if nuitka:
@@ -143,6 +135,7 @@ def main():
             "--no-progressbar",
             "--nofollow-imports",
             "--python-flag=no_site",
+            "--static-libpython=yes",
         ]
 
         nuitka_call.extend(os.getenv("NUITKA_EXTRA_OPTIONS", "").split())

nuitka/tools/testing/run_nuitka_tests/__main__.py

@@ -251,6 +251,16 @@ The standard CPython3.12 test suite. Execute this for all corner cases to be
 covered. With Python 2.x these are not run. Default is %default.""",
     )
 
+    parser.add_option(
+        "--skip-cpython313-tests",
+        action="store_false",
+        dest="cpython313",
+        default=True,
+        help="""\
+The standard CPython3.13 test suite. Execute this for all corner cases to be
+covered. With Python 2.x these are not run. Default is %default.""",
+    )
+
     parser.add_option(
         "--skip-other-cpython-tests",
         action="store_true",
@@ -380,6 +390,15 @@ Do not use Python3.11 even if available on the system. Default is %default.""",
 Do not use Python3.12 even if available on the system. Default is %default.""",
     )
 
+    parser.add_option(
+        "--no-python3.13",
+        action="store_true",
+        dest="no313",
+        default=False,
+        help="""\
+Do not use Python3.13 even if available on the system. Default is %default.""",
+    )
+
     parser.add_option(
         "--coverage",
         action="store_true",
@@ -416,6 +435,17 @@ Allow Nuitka to download code if necessary, e.g. dependency walker on Windows. D
 Enforce the use of MinGW64 on Windows. Defaults to off.""",
     )
 
+    parser.add_option(
+        "--jobs",
+        action="store",
+        dest="jobs",
+        default=None,
+        help="""\
+The value of --jobs to use when calling Nuitka. Use negative values to
+keep cores unused. Nuitka uses available cores by default. Defaults to
+not being passed.""",
+    )
+
     options, positional_args = parser.parse_args()
 
     if positional_args:
@@ -446,6 +476,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.no311 = True
         if sys.version_info[0:2] != (3, 12):
             options.no312 = True
+        if sys.version_info[0:2] != (3, 13):
+            options.no313 = True
 
     if options.cpython_no_other:
         if sys.version_info[0:2] != (2, 6):
@@ -472,6 +504,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.cpython311 = False
         if sys.version_info[0:2] != (3, 12):
             options.cpython312 = False
+        if sys.version_info[0:2] != (3, 13):
+            options.cpython313 = False
 
     if options.cpython_none:
         options.cpython26 = False
@@ -486,6 +520,7 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
         options.cpython310 = False
         options.cpython311 = False
         options.cpython312 = False
+        options.cpython313 = False
 
     if options.coverage and os.path.exists(".coverage"):
         os.unlink(".coverage")
@@ -593,6 +628,8 @@ def main():
             return False
         if command == "python3.12" and options.no312:
             return False
+        if command == "python3.13" and options.no313:
+            return False
 
         # Shortcuts for python versions, also needed for Windows as it won't have
         # the version number in the Python binaries at all.
@@ -616,6 +653,10 @@ def main():
             return True
         if command == "python3.11" and sys.version_info[0:2] == (3, 11):
             return True
+        if command == "python3.12" and sys.version_info[0:2] == (3, 12):
+            return True
+        if command == "python3.13" and sys.version_info[0:2] == (3, 13):
+            return True
 
         path = os.environ["PATH"]
 
@@ -654,6 +695,9 @@ def main():
         if os.name == "nt" and options.mingw64:
             yield "--mingw64"
 
+        if options.jobs is not None:
+            yield "--jobs=%s" % options.jobs
+
         if where is not None:
             tmp_dir = getTempDir()
 
@@ -686,7 +730,8 @@ def main():
         my_print("Run '%s' in '%s'." % (" ".join(parts), os.getcwd()))
 
         if hide_output:
-            result = subprocess.call(parts, stdout=getNullOutput())
+            with getNullOutput() as null_output:
+                result = subprocess.call(parts, stdout=null_output)
         else:
             result = subprocess.call(parts)
 
@@ -933,6 +978,17 @@ def main():
                     else:
                         my_print("The CPython3.12 tests are not present, not run.")
 
+            # Running the Python 3.12 test suite only with CPython3.x.
+            if not use_python.startswith("python2"):
+                if options.cpython313:
+                    if os.path.exists("./tests/CPython313/run_all.py"):
+                        with withExtendedExtraOptions(
+                            *getExtraFlags(where, "313tests", flags)
+                        ):
+                            executeSubTest("./tests/CPython313/run_all.py search")
+                    else:
+                        my_print("The CPython3.13 tests are not present, not run.")
+
     if not any(
         checkExecutableCommand("python%s" % python_version)
         for python_version in getTestExecutionPythonVersions()
@@ -951,55 +1007,65 @@ def main():
             my_print("Cannot execute tests with Python 2.7, disabled or not installed.")
 
     if checkExecutableCommand("python2.6"):
-        execute_tests("python2.6-nodebug", "python2.6", "")
+        execute_tests("python2.6-no-debug", "python2.6", "")
     else:
         my_print("Cannot execute tests with Python 2.6, disabled or not installed.")
 
     if checkExecutableCommand("python2.7"):
-        execute_tests("python2.7-nodebug", "python2.7", "")
+        execute_tests("python2.7-no-debug", "python2.7", "")
     else:
         my_print("Cannot execute tests with Python 2.7, disabled or not installed.")
 
     if checkExecutableCommand("python3.4"):
-        execute_tests("python3.4-nodebug", "python3.4", "")
+        execute_tests("python3.4-no-debug", "python3.4", "")
     else:
         my_print("Cannot execute tests with Python 3.4, disabled or not installed.")
 
     if checkExecutableCommand("python3.5"):
-        execute_tests("python3.5-nodebug", "python3.5", "")
+        execute_tests("python3.5-no-debug", "python3.5", "")
     else:
         my_print("Cannot execute tests with Python 3.5, disabled or not installed.")
 
     if checkExecutableCommand("python3.6"):
-        execute_tests("python3.6-nodebug", "python3.6", "")
+        execute_tests("python3.6-no-debug", "python3.6", "")
     else:
         my_print("Cannot execute tests with Python 3.6, disabled or not installed.")
 
     if checkExecutableCommand("python3.7"):
-        execute_tests("python3.7-nodebug", "python3.7", "")
+        execute_tests("python3.7-no-debug", "python3.7", "")
     else:
         my_print("Cannot execute tests with Python 3.7, disabled or not installed.")
 
     if checkExecutableCommand("python3.8"):
-        execute_tests("python3.8-nodebug", "python3.8", "")
+        execute_tests("python3.8-no-debug", "python3.8", "")
     else:
         my_print("Cannot execute tests with Python 3.8, disabled or not installed.")
 
     if checkExecutableCommand("python3.9"):
-        execute_tests("python3.9-nodebug", "python3.9", "")
+        execute_tests("python3.9-no-debug", "python3.9", "")
     else:
         my_print("Cannot execute tests with Python 3.9, disabled or not installed.")
 
     if checkExecutableCommand("python3.10"):
-        execute_tests("python3.10-nodebug", "python3.10", "")
+        execute_tests("python3.10-no-debug", "python3.10", "")
     else:
         my_print("Cannot execute tests with Python 3.10, disabled or not installed.")
 
     if checkExecutableCommand("python3.11"):
-        execute_tests("python3.11-nodebug", "python3.11", "")
+        execute_tests("python3.11-no-debug", "python3.11", "")
     else:
         my_print("Cannot execute tests with Python 3.11, disabled or not installed.")
 
+    if checkExecutableCommand("python3.12"):
+        execute_tests("python3.12-no-debug", "python3.12", "")
+    else:
+        my_print("Cannot execute tests with Python 3.12, disabled or not installed.")
+
+    if checkExecutableCommand("python3.13"):
+        execute_tests("python3.13-no-debug", "python3.13", "")
+    else:
+        my_print("Cannot execute tests with Python 3.13, disabled or not installed.")
+
     if options.coverage:
         publishCoverageData()
 

nuitka/tools/watch/AutoStage.py

@@ -83,6 +83,7 @@ def onCompilationReportChange(filename, git_stage):
 
             if old_node is not None:
                 old_node.getparent().replace(old_node, new_node)
+                changed = True
 
     if changed:
         new_git_contents = toString(old_report)

nuitka/tree/Building.py

@@ -146,6 +146,7 @@ from .ReformulationAssignmentStatements import (
     buildInplaceAssignNode,
     buildNamedExprNode,
     buildTypeAliasNode,
+    buildTypeVarNode,
 )
 from .ReformulationBooleanExpressions import buildBoolOpNode
 from .ReformulationCallExpressions import buildCallNode
@@ -463,7 +464,7 @@ def handleGlobalDeclarationNode(provider, node, source_ref):
             provider.isExpressionClassBodyBase()
             and closure_variable.getName() == "__class__"
         ):
-            if python_version < 0x340:
+            if python_version < 0x300:
                 SyntaxErrors.raiseSyntaxError(
                     "cannot make __class__ global", source_ref
                 )
@@ -778,6 +779,7 @@ setBuildingDispatchers(
         "Num": buildNumberNode,
         "Bytes": buildBytesNode,
         "Continue": buildStatementLoopContinue,
+        "TypeVar": buildTypeVarNode,
     },
     path_args1={"Ellipsis": buildEllipsisNode},
 )
@@ -785,7 +787,7 @@ setBuildingDispatchers(
 
 def buildParseTree(provider, ast_tree, source_ref, is_main):
     # There are a bunch of branches here, mostly to deal with version
-    # differences for module default variables. pylint: disable=too-many-branches
+    # differences for module default variables.
 
     # Maybe one day, we do exec inlining again, that is what this is for,
     # then is_module won't be True, for now it always is.
@@ -873,7 +875,7 @@ def buildParseTree(provider, ast_tree, source_ref, is_main):
         # This assigns "__path__" value.
         statements.append(createPathAssignment(provider, internal_source_ref))
 
-    if python_version >= 0x340 and not is_main:
+    if python_version >= 0x300 and not is_main:
         statements += (
             StatementAssignmentAttribute(
                 expression=ExpressionModuleAttributeSpecRef(
@@ -925,23 +927,6 @@ def buildParseTree(provider, ast_tree, source_ref, is_main):
             )
         )
 
-    needs__initializing__ = (
-        not provider.isMainModule() and 0x300 <= python_version < 0x340
-    )
-
-    if needs__initializing__:
-        # Set "__initializing__" at the beginning to True
-        statements.append(
-            StatementAssignmentVariableName(
-                provider=provider,
-                variable_name="__initializing__",
-                source=makeConstantRefNode(
-                    constant=True, source_ref=internal_source_ref, user_provided=True
-                ),
-                source_ref=internal_source_ref,
-            )
-        )
-
     if provider.needsAnnotationsDictionary():
         # Set "__annotations__" on module level to {}
         statements.append(
@@ -959,19 +944,6 @@ def buildParseTree(provider, ast_tree, source_ref, is_main):
     if result is not None:
         statements.extend(result.subnode_statements)
 
-    if needs__initializing__:
-        # Set "__initializing__" at the end to False
-        statements.append(
-            StatementAssignmentVariableName(
-                provider=provider,
-                variable_name="__initializing__",
-                source=makeConstantRefNode(
-                    constant=False, source_ref=internal_source_ref, user_provided=True
-                ),
-                source_ref=internal_source_ref,
-            )
-        )
-
     result = makeModuleFrame(
         module=provider, statements=statements, source_ref=source_ref
     )
@@ -990,14 +962,15 @@ def decideCompilationMode(is_top, module_name, module_filename, for_pgo):
 
     is_stdlib = module_filename is not None and isStandardLibraryPath(module_filename)
 
-    # Technically required modules must be bytecode
+    # Technically required modules must be bytecode, do not even ask plugins
+    # about it.
     if is_stdlib and module_name in detectEarlyImports():
         return "bytecode"
 
     result = Plugins.decideCompilation(module_name)
 
-    # Cannot change mode of __main__ to bytecode, that is not going
-    # to work currently.
+    # Cannot change mode of "__main__" to bytecode, that is not going to work
+    # currently, maybe in the future we could allow it.
     if result == "bytecode" and is_top:
         plugins_logger.warning(
             """\
@@ -1010,7 +983,7 @@ required to compiled."""
 
     # Include all of standard library as bytecode, for now. We need to identify
     # which ones really need that.
-    if not is_top and is_stdlib:
+    if not is_top and is_stdlib and result is None:
         result = "bytecode"
 
     # Plugins need to win over PGO, as they might know it better

nuitka/tree/ComplexCallHelperFunctions.py

@@ -350,6 +350,7 @@ def makeStarListArgumentErrorRaise(called_variable, star_list_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -481,6 +482,7 @@ def _makeRaiseExceptionMustBeMapping(called_variable, star_dict_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -695,6 +697,7 @@ def _makeRaiseNoStringItem(called_variable):
         exception_type=ExpressionBuiltinMakeException(
             exception_name="TypeError",
             args=(raise_arg,),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,
@@ -748,6 +751,7 @@ def _makeRaiseDuplicationItem(called_variable, tmp_key_variable):
                     source_ref=internal_source_ref,
                 ),
             ),
+            for_raise=False,
             source_ref=internal_source_ref,
         ),
         exception_value=None,