Eng/improvements (#18892)

* wip

* wip

* wip

* wip

* wip

* some more

Author: memsharded

conan/cli/commands/lock.py

@@ -1,4 +1,3 @@
-from collections import defaultdict
 import os
 
 from conan.api.output import ConanOutput

conan/cli/formatters/audit/vulnerabilities.py

@@ -3,7 +3,7 @@
 from jinja2 import select_autoescape, Template
 
 from conan.api.output import cli_out_write, Color
-from conan.errors import ConanException
+
 
 severity_order = {
     "Critical": 4,

conan/internal/api/list/query_parse.py

@@ -130,14 +130,14 @@ def _infix_to_postfix(exp):
     stack = []
 
     i = -1
-    while(i < len(exp) - 1):
+    while i < len(exp) - 1:
         i += 1
         char = exp[i]
         if char == " ":  # Ignore spaces between expressions and operators
             continue
         if char == ")":  # Pop the stack until "(" and send them to output
             popped = None
-            while(popped != "(" and stack):
+            while popped != "(" and stack:
                 popped = stack.pop()
                 if popped != "(":
                     output.append(popped)

conan/internal/graph/compute_pid.py

@@ -3,7 +3,8 @@
 from conan.internal.errors import conanfile_remove_attr, conanfile_exception_formatter
 from conan.errors import ConanException, ConanInvalidConfiguration
 from conan.internal.methods import auto_header_only_package_id
-from conan.internal.model.info import ConanInfo, RequirementsInfo, RequirementInfo, PythonRequiresInfo
+from conan.internal.model.info import (ConanInfo, RequirementsInfo, RequirementInfo,
+                                       PythonRequiresInfo)
 
 
 def compute_package_id(node, modes, config_version, hook_manager):

conan/internal/graph/graph_binaries.py

@@ -13,8 +13,8 @@
                                         BINARY_INVALID, BINARY_EDITABLE_BUILD, RECIPE_PLATFORM,
                                         BINARY_PLATFORM)
 from conan.internal.graph.proxy import should_update_reference
-from conan.internal.errors import conanfile_exception_formatter, ConanConnectionError, NotFoundException, \
-    PackageNotFoundException
+from conan.internal.errors import (conanfile_exception_formatter, ConanConnectionError,
+                                   NotFoundException, PackageNotFoundException)
 from conan.errors import ConanException
 from conan.internal.model.info import RequirementInfo, RequirementsInfo
 from conan.api.model import PkgReference
@@ -229,8 +229,8 @@ def _evaluate_node(self, node, build_mode, remotes, update):
             if conanfile.vendor and not conanfile.conf.get("tools.graph:vendor", choices=("build",)):
                 node.conanfile.info.invalid = f"The package '{conanfile.ref}' is a vendoring one, " \
                                               f"needs to be built from source, but it " \
-                                              "didn't enable 'tools.graph:vendor=build' to compute " \
-                                              "its dependencies"
+                                              "didn't enable 'tools.graph:vendor=build' to compute" \
+                                              " its dependencies"
                 node.binary = BINARY_INVALID
             if any(n.node.binary in (BINARY_EDITABLE, BINARY_EDITABLE_BUILD)
                    for n in node.transitive_deps.values()):

conan/internal/graph/graph_builder.py

@@ -8,7 +8,8 @@
 from conan.internal.graph.graph import DepsGraph, Node, CONTEXT_HOST, \
     CONTEXT_BUILD, TransitiveRequirement, RECIPE_VIRTUAL, RECIPE_EDITABLE
 from conan.internal.graph.graph import RECIPE_PLATFORM
-from conan.internal.graph.graph_error import GraphLoopError, GraphConflictError, GraphMissingError, GraphError
+from conan.internal.graph.graph_error import (GraphLoopError, GraphConflictError, GraphMissingError,
+                                              GraphError)
 from conan.internal.graph.profile_node_definer import initialize_conanfile_profile
 from conan.internal.graph.provides import check_graph_provides
 from conan.errors import ConanException
@@ -181,7 +182,8 @@ def _prepare_node(node, profile_host, profile_build, down_options, define_consum
         # basic node configuration: calling configure() and requirements()
         conanfile, ref = node.conanfile, node.ref
 
-        profile_options = profile_host.options if node.context == CONTEXT_HOST else profile_build.options
+        profile_options = profile_host.options if node.context == CONTEXT_HOST \
+            else profile_build.options
         assert isinstance(profile_options, Options), type(profile_options)
         run_configure_method(conanfile, down_options, profile_options, ref)
 
@@ -270,7 +272,10 @@ def _resolve_alias(self, node, require, alias, graph):
             graph.aliased[alias] = pointed_ref  # Caching the alias
             new_req = Requirement(pointed_ref)  # FIXME: Ugly temp creation just for alias check
             alias = new_req.alias
-            node.conanfile.output.warning("Requirement 'alias' is provided in Conan 2 mainly for compatibility and upgrade from Conan 1, but it is an undocumented and legacy feature. Please update to use standard versioning mechanisms", warn_tag="legacy")
+            node.conanfile.output.warning("Requirement 'alias' is provided in Conan 2 mainly for "
+                                          "compatibility and upgrade from Conan 1, but it is an "
+                                          "undocumented and legacy feature. Please update to use "
+                                          "standard versioning mechanisms", warn_tag="legacy")
 
     def _resolve_recipe(self, ref, graph_lock):
         result = self._proxy.get_recipe(ref, self._remotes, self._update, self._check_update)

conan/internal/graph/install_graph.py

@@ -397,7 +397,7 @@ def load(filename):
 
     def merge(self, other):
         """
-        @type other: InstallGraph
+        :type other: InstallGraph
         """
         if self.reduced or other.reduced:
             raise ConanException("Reduced build-order files cannot be merged")

conan/internal/graph/installer.py

@@ -5,8 +5,9 @@
 from conan.api.output import ConanOutput, Color
 from conan.internal.methods import run_build_method, run_package_method
 from conan.internal.api.install.generators import write_generators
-from conan.internal.graph.graph import BINARY_BUILD, BINARY_CACHE, BINARY_DOWNLOAD, BINARY_EDITABLE, \
-    BINARY_UPDATE, BINARY_EDITABLE_BUILD, BINARY_SKIP
+from conan.internal.graph.graph import (BINARY_BUILD, BINARY_CACHE, BINARY_DOWNLOAD,
+                                        BINARY_EDITABLE, BINARY_UPDATE, BINARY_EDITABLE_BUILD,
+                                        BINARY_SKIP)
 from conan.internal.graph.install_graph import InstallGraph
 from conan.internal.source import retrieve_exports_sources, config_source
 from conan.internal.errors import conanfile_remove_attr, conanfile_exception_formatter
@@ -94,7 +95,8 @@ def _build(self, conanfile, pref):
             conanfile.output.success("Package '%s' built" % pref.package_id)
             conanfile.output.info("Build folder %s" % conanfile.build_folder)
         except Exception as exc:
-            conanfile.output.error(f"\nPackage '{pref.package_id}' build failed", error_type="exception")
+            conanfile.output.error(f"\nPackage '{pref.package_id}' build failed",
+                                   error_type="exception")
             conanfile.output.warning("Build folder %s" % conanfile.build_folder)
             if isinstance(exc, ConanException):
                 raise exc

conan/internal/graph/python_requires.py

@@ -5,7 +5,7 @@
 from conan.internal.model.requires import Requirement
 
 
-class PyRequire(object):
+class PyRequire:
     def __init__(self, module, conanfile, ref, path, recipe_status, remote):
         self.module = module
         self.conanfile = conanfile

conan/internal/internal_tools.py

@@ -4,7 +4,8 @@
 
 
 def is_universal_arch(settings_value, valid_definitions):
-    if settings_value is None or valid_definitions is None or universal_arch_separator not in settings_value:
+    if (settings_value is None or valid_definitions is None
+            or universal_arch_separator not in settings_value):
         return False
 
     parts = settings_value.split(universal_arch_separator)