conan 2.12.0__tar.gz → 2.12.1__tar.gz

{conan-2.12.0/conan.egg-info → conan-2.12.1}/PKG-INFO

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

{conan-2.12.0 → conan-2.12.1}/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.1'
 conan_version = Version(__version__)

{conan-2.12.0 → conan-2.12.1}/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-2.12.0 → conan-2.12.1}/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-2.12.0 → conan-2.12.1/conan.egg-info}/PKG-INFO

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

{conan-2.12.0 → conan-2.12.1}/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: