conan-server 2.12.0__tar.gz → 2.12.2__tar.gz

{conan_server-2.12.0 → conan_server-2.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan_server
-Version: 2.12.0
+Version: 2.12.2
 Summary: Conan Server of Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan_server-2.12.0 → conan_server-2.12.2}/conan/__init__.py

@@ -1,5 +1,5 @@
 from conan.internal.model.conan_file import ConanFile
 from conan.internal.model.version import Version
 
-__version__ = '2.12.0'
+__version__ = '2.12.2'
 conan_version = Version(__version__)

{conan_server-2.12.0 → conan_server-2.12.2}/conan/api/subapi/config.py

@@ -208,7 +208,7 @@ class ConfigAPI:
         packages_folder = self.global_conf.get("core.cache:storage_path") or os.path.join(self.home(), "p")
         for content in contents:
             content_path = os.path.join(self.home(), content)
-            if content_path == packages_folder or content == "version.txt":
+            if content_path == packages_folder:
                 continue
             ConanOutput().debug(f"Removing {content_path}")
             if os.path.isdir(content_path):

{conan_server-2.12.0 → conan_server-2.12.2}/conan/cli/commands/config.py

@@ -138,7 +138,7 @@ def config_show(conan_api, parser, subparser, *args):
 @conan_subcommand()
 def config_clean(conan_api, parser, subparser, *args):
     """
-    Clean the configuration files in the Conan home folder. (Keeping installed packages)
+    (Experimental) Clean the configuration files in the Conan home folder, while keeping installed packages
     """
     parser.parse_args(*args)
     conan_api.config.clean()

conan_server-2.12.2/conan/tools/sbom/__init__.py

@@ -0,0 +1 @@
+from conan.tools.sbom.cyclonedx import cyclonedx_1_4

{conan_server-2.12.0 → conan_server-2.12.2}/conan/tools/sbom/cyclonedx.py

@@ -1,16 +1,39 @@
 
-def cyclonedx_1_4(graph, **kwargs):
+
+def cyclonedx_1_4(conanfile, name=None, add_build=False, add_tests=False, **kwargs):
     """
-    (Experimental) Generate cyclone 1.4 sbom with json format
+    (Experimental) Generate cyclone 1.4 SBOM with JSON format
+
+    Creates a CycloneDX 1.4 Software Bill of Materials (SBOM) from a given dependency graph.
+
+
+
+    Parameters:
+        conanfile: The conanfile instance.
+        name (str, optional): Custom name for the metadata field.
+        add_build (bool, optional, default=False): Include build dependencies.
+        add_tests (bool, optional, default=False): Include test dependencies.
+
+    Returns:
+        The generated CycloneDX 1.4 document as a string.
+
+    Example usage:
+    ```
+    cyclonedx(conanfile, name="custom_name", add_build=True, add_test=True, **kwargs)
+    ```
+
     """
     import uuid
     import time
     from datetime import datetime, timezone
+    graph = conanfile.subgraph
 
     has_special_root_node = not (getattr(graph.root.ref, "name", False) and getattr(graph.root.ref, "version", False) and getattr(graph.root.ref, "revision", False))
     special_id = str(uuid.uuid4())
 
-    components = [node for node in graph.nodes]
+    name_default = getattr(graph.root.ref, "name", False) or "conan-sbom"
+    name_default += f"/{graph.root.ref.version}" if bool(getattr(graph.root.ref, "version", False)) else ""
+    components = [node for node in graph.nodes if (node.context == "host" or add_build) and (not node.test or add_tests)]
     if has_special_root_node:
         components = components[1:]
 
@@ -22,7 +45,9 @@ def cyclonedx_1_4(graph, **kwargs):
         dependencies.append(deps)
     for c in components:
         deps = {"ref": f"pkg:conan/{c.name}@{c.ref.version}?rref={c.ref.revision}"}
-        depends_on = [f"pkg:conan/{d.dst.name}@{d.dst.ref.version}?rref={d.dst.ref.revision}" for d in c.dependencies]
+        dep = [d for d in c.dependencies if (d.dst.context == "host" or add_build) and (not d.dst.test or add_tests)]
+
+        depends_on = [f"pkg:conan/{d.dst.name}@{d.dst.ref.version}?rref={d.dst.ref.revision}" for d in dep]
         if depends_on:
             deps["dependsOn"] = depends_on
         dependencies.append(deps)
@@ -56,7 +81,7 @@ def cyclonedx_1_4(graph, **kwargs):
             "component": {
                 "author": "Conan",
                 "bom-ref": special_id if has_special_root_node else f"pkg:conan/{c.name}@{c.ref.version}?rref={c.ref.revision}",
-                "name": graph.root.conanfile.display_name,
+                "name": name if name else name_default,
                 "type": "library"
             },
             "timestamp": f"{datetime.fromtimestamp(time.time(), tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')}",

{conan_server-2.12.0 → conan_server-2.12.2}/conan_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conan-server
-Version: 2.12.0
+Version: 2.12.2
 Summary: Conan Server of Conan C/C++ package manager
 Home-page: https://conan.io
 Author: JFrog LTD

{conan_server-2.12.0 → conan_server-2.12.2}/conans/client/graph/compatibility.py

@@ -1,17 +1,49 @@
 import os
 from collections import OrderedDict
 
+from conan.api.output import ConanOutput
 from conan.internal.cache.home_paths import HomePaths
 from conans.client.graph.compute_pid import run_validate_package_id
 from conans.client.loader import load_python_file
 from conan.internal.errors import conanfile_exception_formatter, scoped_traceback
 from conan.errors import ConanException
+from conans.client.migrations import CONAN_GENERATED_COMMENT
 
 # TODO: Define other compatibility besides applications
+from conans.util.files import load, save
+
 _default_compat = """\
 # This file was generated by Conan. Remove this comment if you edit this file or Conan
 # will destroy your changes.
-from cppstd_compat import cppstd_compat
+
+from conan.tools.build import supported_cppstd, supported_cstd
+from conan.errors import ConanException
+
+
+def cppstd_compat(conanfile):
+    # It will try to find packages with all the cppstd versions
+    extension_properties = getattr(conanfile, "extension_properties", {})
+    compiler = conanfile.settings.get_safe("compiler")
+    compiler_version = conanfile.settings.get_safe("compiler.version")
+    cppstd = conanfile.settings.get_safe("compiler.cppstd")
+    if not compiler or not compiler_version:
+        return []
+    factors = []  # List of list, each sublist is a potential combination
+    if cppstd is not None and extension_properties.get("compatibility_cppstd") is not False:
+        cppstd_possible_values = supported_cppstd(conanfile)
+        if cppstd_possible_values is None:
+            conanfile.output.warning(f'No cppstd compatibility defined for compiler "{compiler}"')
+        else: # The current cppst must be included in case there is other factor
+            factors.append([{"compiler.cppstd": v} for v in cppstd_possible_values])
+
+    cstd = conanfile.settings.get_safe("compiler.cstd")
+    if cstd is not None and extension_properties.get("compatibility_cstd") is not False:
+        cstd_possible_values = supported_cstd(conanfile)
+        if cstd_possible_values is None:
+            conanfile.output.warning(f'No cstd compatibility defined for compiler "{compiler}"')
+        else:
+            factors.append([{"compiler.cstd": v} for v in cstd_possible_values if v != cstd])
+    return factors
 
 
 def compatibility(conanfile):
@@ -52,47 +84,24 @@ def _factors_combinations(factors):
 """
 
 
-_default_cppstd_compat = """\
-# This file was generated by Conan. Remove this comment if you edit this file or Conan
-# will destroy your changes.
-from conan.tools.build import supported_cppstd, supported_cstd
-from conan.errors import ConanException
-
-
-def cppstd_compat(conanfile):
-    # It will try to find packages with all the cppstd versions
-    extension_properties = getattr(conanfile, "extension_properties", {})
-    compiler = conanfile.settings.get_safe("compiler")
-    compiler_version = conanfile.settings.get_safe("compiler.version")
-    cppstd = conanfile.settings.get_safe("compiler.cppstd")
-    if not compiler or not compiler_version:
-        return []
-    factors = []  # List of list, each sublist is a potential combination
-    if cppstd is not None and extension_properties.get("compatibility_cppstd") is not False:
-        cppstd_possible_values = supported_cppstd(conanfile)
-        if cppstd_possible_values is None:
-            conanfile.output.warning(f'No cppstd compatibility defined for compiler "{compiler}"')
-        else: # The current cppst must be included in case there is other factor
-            factors.append([{"compiler.cppstd": v} for v in cppstd_possible_values])
-
-    cstd = conanfile.settings.get_safe("compiler.cstd")
-    if cstd is not None and extension_properties.get("compatibility_cstd") is not False:
-        cstd_possible_values = supported_cstd(conanfile)
-        if cstd_possible_values is None:
-            conanfile.output.warning(f'No cstd compatibility defined for compiler "{compiler}"')
-        else:
-            factors.append([{"compiler.cstd": v} for v in cstd_possible_values if v != cstd])
-    return factors
-"""
-
-
 def migrate_compatibility_files(cache_folder):
-    from conans.client.migrations import update_file
     compatible_folder = HomePaths(cache_folder).compatibility_plugin_path
     compatibility_file = os.path.join(compatible_folder, "compatibility.py")
     cppstd_compat_file = os.path.join(compatible_folder, "cppstd_compat.py")
-    update_file(compatibility_file, _default_compat)
-    update_file(cppstd_compat_file, _default_cppstd_compat)
+
+    def _should_migrate_file(file_path):
+        if not os.path.exists(file_path):
+            return True
+        content = load(file_path)
+        first_line = content.lstrip().split("\n", 1)[0]
+        return CONAN_GENERATED_COMMENT in first_line
+
+    if _should_migrate_file(compatibility_file) and _should_migrate_file(cppstd_compat_file):
+        if os.path.exists(compatibility_file) and load(compatibility_file) != _default_compat:
+            ConanOutput().success("Migration: Successfully updated compatibility.py}")
+        save(compatibility_file, _default_compat)
+        if os.path.exists(cppstd_compat_file):
+            os.remove(cppstd_compat_file)
 
 
 class BinaryCompatibility:

{conan_server-2.12.0 → conan_server-2.12.2}/test/integration/command/config_test.py

@@ -232,8 +232,14 @@ def test_config_clean(storage_path):
     assert "bar" not in tc.out
     tc.run("config show core.upload:retry")
     assert "7" not in tc.out
-    assert not os.path.exists(os.path.join(tc.cache_folder, "extensions"))
+    assert os.path.exists(os.path.join(tc.cache_folder, "extensions"))
+    assert not os.path.exists(os.path.join(tc.cache_folder, "extensions", "compatibility", "mycomp.py"))
     assert os.path.exists(absolut_storage_path)
+    # This will error because the call to clean will remove the profiles
+    tc.run("create .", assert_error=True)
+    # Works after regenerating them!
+    tc.run("profile detect")
+    tc.run("create .")
 
 
 def test_config_reinit():

{conan_server-2.12.0 → conan_server-2.12.2}/test/integration/test_migrations.py

@@ -31,8 +31,7 @@ def _drop_lru_column(db_folder):
 
 @pytest.mark.parametrize(["plugin_path", "string_replace", "new_string"],
                          [("profile.py", "msvc", "EME_ESE_VC"),
-                          ("compatibility/compatibility.py", "conanfile", "conian_file"),
-                          ("compatibility/cppstd_compat.py", "conanfile", "conian_file")])
+                          ("compatibility/compatibility.py", "conanfile", "conian_file")])
 def test_migration_profile_checker_plugin(plugin_path, string_replace, new_string):
     t = TestClient()
     # Any command that checks the package cache generates the DB
@@ -151,3 +150,44 @@ def test_back_default_compatibility_migration():
     with patch('conan.api.conan_api.ClientMigrator', new=lambda *args, **kwargs: migrator):
         t.run("-v")  # Fire the backward migration
         assert f"WARN: Downgrading cache from Conan {conan_version} to 2.3.2" in t.out
+
+
+class TestMigrationCppstdCompat:
+    def test_migration(self):
+        t = TestClient()
+        t.run("-v")
+        cppstd_compat_path = "extensions/plugins/compatibility/cppstd_compat.py"
+        compatibility_path = "extensions/plugins/compatibility/compatibility.py"
+
+        # both files exist and not modified
+        t.save_home({"version.txt": "2.11"})
+        t.run("-v")
+        assert "def cppstd_compat(conanfile)" in t.load_home(compatibility_path)
+        assert not os.path.exists(os.path.join(t.cache_folder, cppstd_compat_path))
+
+    def test_cppstd_modified(self):
+        t = TestClient()
+        t.run("-v")
+        cppstd_compat_path = "extensions/plugins/compatibility/cppstd_compat.py"
+        compatibility_path = "extensions/plugins/compatibility/compatibility.py"
+        # cppstd_compat modified
+        t.save_home({"version.txt": "2.11",
+                     compatibility_path: "# This file was generated by Conan",
+                     cppstd_compat_path: "custom file content"})
+        t.run("-v")
+        assert t.load_home(cppstd_compat_path) == "custom file content"
+        # compatibility not migrated, keeps the old content
+        assert "def cppstd_compat(conanfile)" not in t.load_home(compatibility_path)
+
+    def test_compatibility_modified(self):
+        t = TestClient()
+        t.run("-v")
+        cppstd_compat_path = "extensions/plugins/compatibility/cppstd_compat.py"
+        compatibility_path = "extensions/plugins/compatibility/compatibility.py"
+        t.save_home({"version.txt": "2.11",
+                     cppstd_compat_path: "# This file was generated by Conan POTATO",
+                     compatibility_path: "Modified file"})
+        t.run("-v")
+        assert t.load_home(compatibility_path) == "Modified file"
+        # not Removed because compatibility was modified
+        assert "POTATO" in t.load_home(cppstd_compat_path)