Nuitka-winsvc 2.1.1__tar.gz → 2.1.2__tar.gz

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/Nuitka_winsvc.egg-info/PKG-INFO

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/PKG-INFO

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/OptionParsing.py

@@ -2001,6 +2001,7 @@ def _considerGithubWorkflowOptions(phase):
         "enable-plugins",
         "disable-plugin",
         "disable-plugins",
+        "user-plugin",
     )
 
     def filterByName(key):

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/Version.py

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/build/static_src/HelpersFilesystemPaths.c

@@ -836,7 +836,7 @@ bool expandTemplatePath(char *target, char const *source, size_t buffer_size) {
     char var_name[1024];
     char *w = NULL;
 
-    bool var_started = false;
+    NUITKA_MAY_BE_UNUSED bool var_started = false;
 
     while (*source != 0) {
         if (*source == '{') {

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/plugins/PluginBase.py

@@ -14,7 +14,6 @@ it being used.
 
 import ast
 import functools
-import importlib
 import inspect
 import os
 import sys
@@ -106,6 +105,15 @@ _module_config_constants = {}
 _module_config_variables = {}
 
 
+def _getImportLibModule():
+    try:
+        import importlib
+    except ImportError:
+        return None
+    else:
+        return importlib
+
+
 def _getEvaluationContext():
     # Using global here, as this is really a singleton, in the form of a module,
     # pylint: disable=global-statement
@@ -145,7 +153,7 @@ def _getEvaluationContext():
             # Frequent used modules
             "sys": sys,
             "os": os,
-            "importlib": importlib,
+            "importlib": _getImportLibModule(),
             "appdirs": getAppdirsModule(),
             # Python version string
             "python_version_str": python_version_str,
@@ -1259,6 +1267,14 @@ except ImportError:
         # Virtual method, pylint: disable=no-self-use,unused-argument
         return False
 
+    def onClassBodyParsing(self, module_name, class_name, node):
+        # Virtual method, pylint: disable=no-self-use,unused-argument
+        """Provide a different class body for the class of that module.
+
+        Should return a boolean, indicating if any actual change was done.
+        """
+        return False
+
     def getCacheContributionValues(self, module_name):
         """Provide values that represent the include of a plugin on the compilation.
 

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/plugins/Plugins.py

@@ -1354,6 +1354,19 @@ class Plugins(object):
                 body=body,
             )
 
+    @classmethod
+    def onClassBodyParsing(cls, provider, class_name, node):
+        module_name = provider.getParentModule().getFullName()
+
+        for plugin in getActivePlugins():
+            # TODO: Could record what classes got modified by what plugin
+            # and in what way checking the return value
+            plugin.onClassBodyParsing(
+                module_name=module_name,
+                class_name=class_name,
+                node=node,
+            )
+
     @classmethod
     def getCacheContributionValues(cls, module_name):
         for plugin in getActivePlugins():

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/plugins/standard/AntiBloatPlugin.py

@@ -535,6 +535,66 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
 
         return result
 
+    def _onClassBodyParsing(self, module_name, anti_bloat_config, class_name, node):
+        replace_code = anti_bloat_config.get("change_class", {}).get(class_name)
+
+        if replace_code == "un-usable":
+            replace_code = """
+'''
+class %(class_name)s:
+    def __init__(self, *args, **kwargs):
+        raise RuntimeError("Must not call %(module_name)s.%(class_name)s")
+'''
+""" % {
+                "module_name": module_name,
+                "class_name": class_name,
+            }
+
+        if replace_code is None:
+            return False
+
+        replacement = self.evaluateExpression(
+            full_name=module_name,
+            expression=replace_code,
+            config_name="module '%s' config 'change_class' of '%s'"
+            % (module_name, class_name),
+            extra_context=self._getContextCode(
+                module_name=module_name, anti_bloat_config=anti_bloat_config
+            ),
+            single_value=True,
+        )
+
+        # Single node is required, extract the generated module body with
+        # single expression only statement value or a function body.
+        replacement = ast.parse(replacement).body[0]
+
+        node.body[:] = replacement.body
+        node.bases = replacement.bases
+
+        if self.show_changes:
+            self.info(
+                "Updated module '%s' class '%s'." % (module_name.asString(), class_name)
+            )
+
+        return True
+
+    def onClassBodyParsing(self, module_name, class_name, node):
+        result = False
+
+        config = self.config.get(module_name, section="anti-bloat")
+
+        if config:
+            for anti_bloat_config in config:
+                if self._onClassBodyParsing(
+                    module_name=module_name,
+                    anti_bloat_config=anti_bloat_config,
+                    class_name=class_name,
+                    node=node,
+                ):
+                    result = True
+
+        return result
+
     def _getModuleBloatModeOverrides(self, using_module_name, intended_module_name):
         while 1:
             config = self.config.get(using_module_name, section="anti-bloat")

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -90,6 +90,38 @@
     patterns:
       - 'public.xml'
 
+- module-name: 'antlr4.FileStream' # checksum: b7fe4fce
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'import unittest': ''
+      change_class:
+        'TestFileStream': 'un-usable'
+
+- module-name: 'antlr4.InputStream' # checksum: e9e7bd9b
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'import unittest': ''
+      change_class:
+        'TestInputStream': 'un-usable'
+
+- module-name: 'antlr4.IntervalSet' # checksum: 214ba83e
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'import unittest': ''
+      change_class:
+        'TestIntervalSet': 'un-usable'
+
+- module-name: 'antlr4.Recognizer' # checksum: 6e605dda
+  anti-bloat:
+    - description: 'remove unittest reference'
+      replacements_plain:
+        'import unittest': ''
+      change_class:
+        'Test': 'un-usable'
+
 - module-name: 'anyio._core._eventloop' # checksum: c0b82a1e
   implicit-imports:
     - depends:
@@ -534,6 +566,13 @@
     - depends:
         - 'urllib.request'
 
+- module-name: 'celery' # checksum: 7d07a2d1
+  anti-bloat:
+    - description: 'remove IPython reference'
+      no-auto-follow:
+        'IPython': 'ignore'
+      when: 'not use_ipython'
+
 - module-name: 'certifi' # checksum: 73df1a1e
   data-files:
     patterns:
@@ -1039,6 +1078,11 @@
     - depends:
         - 'Equation.equation_*'
 
+- module-name: 'eth_utils' # checksum: c62fca1b
+  data-files:
+    dirs:
+      - '__json'
+
 - module-name: 'evaluate.config' # checksum: becc1d28
   anti-bloat:
     - description: 'workaround python version test not compile time recognized'
@@ -1540,6 +1584,17 @@
     - description: 'workaround hard module import attribute bug'
       append_plain: 'from .utils.tqdm import tqdm'
 
+- module-name: 'hydra' # checksum: 380a0a91
+  data-files:
+    dirs:
+      - 'conf'
+
+- module-name: 'hydra.core.plugins' # checksum: f4d9feae
+  implicit-imports:
+    - depends:
+        - 'hydra._internal.core_plugins.*'
+        - 'hydra_plugins.*'
+
 - module-name: 'imageio.core.imopen' # checksum: 7af58240
   anti-bloat:
     - replacements_plain:
@@ -4287,6 +4342,18 @@
     patterns:
       - 'words.txt'
 
+- module-name: 'selenium' # checksum: 19747624
+  data-files:
+    dirs:
+      - '.'
+  dlls:
+    - from_filenames:
+        relative_path: 'webdriver/common/windows'
+        prefixes:
+          - 'selenium-manager'
+        executable: 'yes'
+      when: 'win32'
+
 - module-name: 'sentence_transformers.SentenceTransformer' # checksum: c6062648
   implicit-imports:
     - depends:
@@ -6655,6 +6722,11 @@
         'from distributed import Client': 'raise ImportError'
       when: 'not use_dask'
 
+- module-name: 'twofish' # checksum: c8ae9b1e
+  implicit-imports:
+    - depends:
+        - '_twofish'
+
 - module-name: 'tzdata' # checksum: dae3c0e3
   data-files:
     dirs:

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/tree/ReformulationClasses.py

@@ -45,6 +45,7 @@ from nuitka.nodes.VariableReleaseNodes import (
     makeStatementReleaseVariable,
     makeStatementsReleaseVariables,
 )
+from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
 
 from .ReformulationClasses3 import buildClassNode3
@@ -63,6 +64,10 @@ from .TreeHelpers import (
 def buildClassNode2(provider, node, source_ref):
     # This function is the Python2 special case with special re-formulation as
     # according to Developer Manual, and it's very detailed, pylint: disable=too-many-locals
+
+    # First, allow plugins to modify the code if they want to.
+    Plugins.onClassBodyParsing(provider=provider, class_name=node.name, node=node)
+
     class_statement_nodes, class_doc = extractDocFromBody(node)
 
     function_body = ExpressionClassBodyP2(

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.2}/nuitka/tree/ReformulationClasses3.py

@@ -79,6 +79,7 @@ from nuitka.nodes.VariableRefNodes import (
 )
 from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 from nuitka.Options import isExperimental
+from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
 from nuitka.specs.ParameterSpecs import ParameterSpec
 
@@ -126,6 +127,10 @@ def buildClassNode3(provider, node, source_ref):
 
     # This function is the Python3 special case with special re-formulation as
     # according to Developer Manual.
+
+    # First, allow plugins to modify the code if they want to.
+    Plugins.onClassBodyParsing(provider=provider, class_name=node.name, node=node)
+
     class_statement_nodes, class_doc = extractDocFromBody(node)
 
     # We need a scope for the temporary variables, and they might be closured.