conan 2.22.0__tar.gz → 2.22.2__tar.gz

{conan-2.22.0/conan.egg-info → conan-2.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan
-Version: 2.22.0
+Version: 2.22.2
 Summary: Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan-2.22.0 → conan-2.22.2}/conan/__init__.py

@@ -2,5 +2,5 @@ from conan.internal.model.conan_file import ConanFile
 from conan.internal.model.workspace import Workspace
 from conan.internal.model.version import Version
 
-__version__ = '2.22.0'
+__version__ = '2.22.2'
 conan_version = Version(__version__)

{conan-2.22.0 → conan-2.22.2}/conan/internal/graph/graph_binaries.py

@@ -164,8 +164,17 @@ class GraphBinariesAnalyzer:
             for package_id, compatible_package in compatibles.items():
                 node._package_id = package_id  # Modifying package id under the hood, FIXME
                 node.binary = None  # Invalidate it
+                # Check that this same reference hasn't already been checked
+                if self._evaluate_is_cached(node):
+                    # If we have already processed this compatible pref,
+                    # mark it as usable based on previous evaluation
+                    if node.binary in (BINARY_CACHE, BINARY_DOWNLOAD):
+                        self._compatible_found(conanfile, package_id, compatible_package)
+                    return
                 cache_latest_prev = self._compatible_cache_latest_prev(node)  # not check remotes
                 if cache_latest_prev:
+                    # If we have binary info, it means that the package was already processed,
+                    # and we got a hit from the cache of compatibles
                     self._binary_in_cache(node, cache_latest_prev)
                     self._compatible_found(conanfile, package_id, compatible_package)
                     return
@@ -186,6 +195,13 @@ class GraphBinariesAnalyzer:
                                       f"{conanfile.info.dump_diff(compatible_package)}")
                 node._package_id = package_id  # Modifying package id under the hood, FIXME
                 node.binary = None  # Invalidate it
+
+                if self._evaluate_is_cached(node):
+                    # If we have already processed this compatible pref,
+                    # mark it as usable based on previous evaluation
+                    if node.binary in (BINARY_CACHE, BINARY_DOWNLOAD, BINARY_UPDATE):
+                        self._compatible_found(conanfile, package_id, compatible_package)
+                    return
                 cache_latest_prev = self._compatible_cache_latest_prev(node)  # Not check remotes
                 if cache_latest_prev:
                     self._evaluate_cache_update(cache_latest_prev, node, remotes, update)
@@ -203,10 +219,6 @@ class GraphBinariesAnalyzer:
         """ simplified checking of compatible_packages, that should be found existing, but
         will never be built, for example. They cannot be editable either at this point.
         """
-        # Check that this same reference hasn't already been checked
-        if self._evaluate_is_cached(node):
-            return
-
         # TODO: Test that this works
         if node.conanfile.info.invalid:
             node.binary = BINARY_INVALID

{conan-2.22.0 → conan-2.22.2}/conan/internal/model/cpp_info.py

@@ -803,17 +803,13 @@ class CppInfo:
                   f"other internal components that are not defined: {missing_internal}"
             raise ConanException(msg)
         external = [c[0] for c in comps if c[0] is not None]
+        if not external:
+            return
         # Only direct host (not test) dependencies can define required components
         # We use conanfile.dependencies to use the already replaced ones by "replace_requires"
         # So consumers can keep their ``self.cpp_info.requires = ["pkg_name::comp"]``
         direct_dependencies = [r.ref.name for r, d in conanfile.dependencies.items() if r.direct
                                and not r.build and not r.is_test and r.visible and not r.override]
-        if not external:
-            if direct_dependencies and comps:
-                msg = (f"{conanfile}: package_info(): There are direct dependencies, "
-                       "but no '(cpp_info/components).requires' to them.")
-                raise ConanException(msg)
-            return
 
         for e in external:
             if e not in direct_dependencies:
@@ -821,6 +817,7 @@ class CppInfo:
                       f"that includes package '{e}::', but such package is not a a direct " \
                       f"requirement of the recipe"
                 raise ConanException(msg)
+        # TODO: discuss if there are cases that something is required but not transitive
         for e in direct_dependencies:
             if e not in external:
                 msg = f"{conanfile}: package_info(): The direct dependency '{e}' is not used by " \

{conan-2.22.0 → conan-2.22.2/conan.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan
-Version: 2.22.0
+Version: 2.22.2
 Summary: Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD