Merge branch 'develop2' into ar/graph-context-build-only-binary-missmatch-issue

Author: AbrilRBS

.ci/docker/conan-tests

@@ -17,7 +17,7 @@ ENV PY37=3.7.9 \
     CMAKE_3_19=/usr/share/cmake-3.19.7/bin/cmake \
     CMAKE_3_23=/usr/share/cmake-3.23.5/bin/cmake \
     CMAKE_3_27=/usr/share/cmake-3.27.9/bin/cmake \
-    CMAKE_4_0=/usr/share/cmake-4.0.0-rc3/bin/cmake \
+    CMAKE_4_2=/usr/share/cmake-4.2.1/bin/cmake \
     GCC_9=/usr/bin/gcc-9 \
     GXX_9=/usr/bin/g++-9 \
     GCC_11=/usr/bin/gcc-11 \
@@ -27,7 +27,7 @@ ENV PY37=3.7.9 \
     BAZEL_6=6.5.0 \
     BAZEL_7=7.6.2 \
     BAZEL_8=8.4.2 \
-    EMSDK=4.0.10
+    EMSDK=4.0.22
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -123,15 +123,15 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7
     tar -xvzf cmake-3.23.5-Linux-x86_64.tar.gz && mv cmake-3.23.5-linux-x86_64/ /usr/share/cmake-3.23.5 && \
     wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-Linux-x86_64.tar.gz   && \
     tar -xvzf cmake-3.27.9-Linux-x86_64.tar.gz && mv cmake-3.27.9-linux-x86_64/ /usr/share/cmake-3.27.9 && \
-    wget https://cmake.org/files/v4.0/cmake-4.0.0-rc3-linux-x86_64.tar.gz   && \
-    tar -xvzf cmake-4.0.0-rc3-linux-x86_64.tar.gz && mv cmake-4.0.0-rc3-linux-x86_64/ /usr/share/cmake-4.0.0-rc3 && \
+    wget https://cmake.org/files/v4.2/cmake-4.2.1-linux-x86_64.tar.gz   && \
+    tar -xvzf cmake-4.2.1-linux-x86_64.tar.gz && mv cmake-4.2.1-linux-x86_64/ /usr/share/cmake-4.2.1 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_15 10 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_16 20 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_17 30 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_19 40 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_23 50 && \
     update-alternatives --install /usr/bin/cmake cmake $CMAKE_3_27 60 && \
-    update-alternatives --install /usr/bin/cmake cmake $CMAKE_4_0 70 && \
+    update-alternatives --install /usr/bin/cmake cmake $CMAKE_4_2 70 && \
     # set CMake 3.15 as default
     update-alternatives --set cmake $CMAKE_3_15
 
@@ -175,6 +175,7 @@ RUN cd /tmp && \
     wget https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK}.tar.gz && \
     tar xzf ${EMSDK}.tar.gz --directory /usr/share && \
     cd /usr/share/emsdk-${EMSDK} && \
+    pyenv local 3.12 && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \

.github/workflows/osx-tests.yml

@@ -51,7 +51,7 @@ jobs:
             ~/Applications/CMake/3.19.7
             ~/Applications/CMake/3.23.5
             ~/Applications/CMake/3.27.9
-            ~/Applications/CMake/4.0.0-rc3
+            ~/Applications/CMake/4.2.1
             ~/Applications/bazel/6.5.0
             ~/Applications/bazel/7.6.2
             ~/Applications/bazel/8.4.2
@@ -80,7 +80,7 @@ jobs:
         if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
           set -e
-          CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5" "3.27.9" "4.0.0-rc3")
+          CMAKE_PRECOMP_VERSIONS=("3.19.7" "3.23.5" "3.27.9" "4.2.1")
           for version in "${CMAKE_PRECOMP_VERSIONS[@]}"; do
             echo "Downloading and installing precompiled universal CMake version ${version}..."
             wget -q --no-check-certificate https://cmake.org/files/v${version%.*}/cmake-${version}-macos-universal.tar.gz
@@ -134,7 +134,7 @@ jobs:
             ~/Applications/CMake/3.19.7
             ~/Applications/CMake/3.23.5
             ~/Applications/CMake/3.27.9
-            ~/Applications/CMake/4.0.0-rc3
+            ~/Applications/CMake/4.2.1
             ~/Applications/bazel/6.5.0
             ~/Applications/bazel/7.6.2
             ~/Applications/bazel/8.4.2
@@ -147,6 +147,18 @@ jobs:
           xcrun --sdk macosx --show-sdk-version
           clang --version
 
+      # Install system dependencies BEFORE setting up the matrix Python.
+      # This prevents Emscripten (which requires Python 3.10+) from crashing
+      # when trying to use Python 3.8 from the matrix.
+      - name: Install homebrew dependencies
+        run: |
+          brew update
+          brew install xcodegen make libtool zlib autoconf automake ninja emscripten
+          export PATH=${HOME}/Applications/CMake/3.15.7/bin:$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin
+          emcc --version
+          cmake --version
+          bazel --version
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -160,15 +172,6 @@ jobs:
           pip install -r conans/requirements_dev.txt
           pip install meson
 
-      - name: Install homebrew dependencies
-        run: |
-          brew update
-          brew install xcodegen make libtool zlib autoconf automake ninja emscripten
-          export PATH=${HOME}/Applications/CMake/3.15.7/bin:$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin
-          emcc --version
-          cmake --version
-          bazel --version
-
       - name: Run tests
         uses: ./.github/actions/test-coverage
         with:

.github/workflows/win-tests.yml

@@ -162,7 +162,7 @@ jobs:
             C:\tools\cmake\3.19.7
             C:\tools\cmake\3.23.5
             C:\tools\cmake\3.27.9
-            C:\tools\cmake\4.0.0-rc3
+            C:\tools\cmake\4.2.1
             C:\tools\bazel\6.5.0
             C:\tools\bazel\7.6.2
             C:\tools\bazel\8.4.2
@@ -171,7 +171,7 @@ jobs:
       - name: Install CMake versions
         if: steps.cache-tools.outputs.cache-hit != 'true'
         run: |
-          $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7", "3.23.5", "3.27.9", "4.0.0-rc3"
+          $CMAKE_BUILD_VERSIONS = "3.15.7", "3.19.7", "3.23.5", "3.27.9", "4.2.1"
           foreach ($version in $CMAKE_BUILD_VERSIONS) {
             Write-Host "Downloading CMake version $version for Windows..."
             $destination = "C:\tools\cmake\$version"

conan/__init__.py

@@ -2,5 +2,5 @@
 from conan.internal.model.workspace import Workspace
 from conan.internal.model.version import Version
 
-__version__ = '2.24.0-dev'
+__version__ = '2.25.0-dev'
 conan_version = Version(__version__)

conan/api/conan_api.py

@@ -74,13 +74,16 @@ def __init__(self, cache_folder=None):
         self.upload: UploadAPI = UploadAPI(self, self._api_helpers)
         #: Used to download recipes and packages from remotes
         self.download: DownloadAPI = DownloadAPI(self)
-        self.cache = CacheAPI(self, self._api_helpers)
-        self.lockfile = LockfileAPI(self)
+        #: Used to interact wit the packages storage cache
+        self.cache: CacheAPI = CacheAPI(self, self._api_helpers)
+        #: Used to read and manage lockfile files
+        self.lockfile: LockfileAPI = LockfileAPI(self)
         self.local = LocalAPI(self, self._api_helpers)
-        self.audit = AuditAPI(self)
+        #: Used to check vulnerabilities of dependencies
+        self.audit: AuditAPI = AuditAPI(self)
         # Now, lazy loading of editables
         self.workspace = WorkspaceAPI(self)
-        self.report = ReportAPI(self, self._api_helpers)
+        self.report: ReportAPI = ReportAPI(self, self._api_helpers)
 
     @property
     def home_folder(self) -> str:

conan/api/model/list.py

@@ -203,6 +203,7 @@ def __bool__(self):
 
     def merge(self, other):
         assert isinstance(other, PackagesList)
+
         def recursive_dict_update(d, u):  # TODO: repeated from conandata.py
             for k, v in u.items():
                 if isinstance(v, dict):

conan/api/output.py

@@ -135,17 +135,17 @@ def set_output_level(cls, level):
     @classmethod
     def valid_log_levels(cls):
         return {"quiet": LEVEL_QUIET,  # -vquiet 80
-            "error": LEVEL_ERROR,  # -verror 70
-            "warning": LEVEL_WARNING,  # -vwaring 60
-            "notice": LEVEL_NOTICE,  # -vnotice 50
-            "status": LEVEL_STATUS,  # -vstatus 40
-            None: LEVEL_VERBOSE,  # -v 30
-            "verbose": LEVEL_VERBOSE,  # -vverbose 30
-            "debug": LEVEL_DEBUG,  # -vdebug 20
-            "v": LEVEL_DEBUG,  # -vv 20
-            "trace": LEVEL_TRACE,  # -vtrace 10
-            "vv": LEVEL_TRACE  # -vvv 10
-        }
+                "error": LEVEL_ERROR,  # -verror 70
+                "warning": LEVEL_WARNING,  # -vwaring 60
+                "notice": LEVEL_NOTICE,  # -vnotice 50
+                "status": LEVEL_STATUS,  # -vstatus 40
+                None: LEVEL_VERBOSE,  # -v 30
+                "verbose": LEVEL_VERBOSE,  # -vverbose 30
+                "debug": LEVEL_DEBUG,  # -vdebug 20
+                "v": LEVEL_DEBUG,  # -vv 20
+                "trace": LEVEL_TRACE,  # -vtrace 10
+                "vv": LEVEL_TRACE  # -vvv 10
+                }
 
     @classmethod
     def define_log_level(cls, v):

conan/api/subapi/cache.py

@@ -22,6 +22,8 @@
 
 
 class CacheAPI:
+    """ This CacheAPI is used to interact with the packages storage cache
+    """
 
     def __init__(self, conan_api, api_helpers):
         self._conan_api = conan_api
@@ -74,8 +76,9 @@ def package_path(self, pref: PkgReference):
     def check_integrity(self, package_list, return_pkg_list=False):
         """
         Check if the recipes and packages are corrupted
-        :parameter package_list: PackagesList to check
-        :parameter return_pkg_list: If True, return a PackagesList with corrupted artifacts
+
+        :param package_list: PackagesList to check
+        :param return_pkg_list: If True, return a PackagesList with corrupted artifacts
         :return: PackagesList with corrupted artifacts if return_pkg_list is True
         :raises: ConanExcepcion if there are corrupted artifacts and return_pkg_list is False
         """
@@ -92,6 +95,7 @@ def clean(self, package_list, source=True, build=True, download=True, temp=True,
         """
         Remove non critical folders from the cache, like source, build and download (.tgz store)
         folders.
+
         :param package_list: the package lists that should be cleaned
         :param source: boolean, remove the "source" folder if True
         :param build: boolean, remove the "build" folder if True
@@ -138,7 +142,7 @@ def clean(self, package_list, source=True, build=True, download=True, temp=True,
                 if download:
                     rmdir(pref_layout.download_package())
 
-    def save(self, package_list, tgz_path, no_source=False):
+    def save(self, package_list: PackagesList, tgz_path, no_source=False) -> None:
         global_conf = self._api_helpers.global_conf
         cache = PkgCache(self._conan_api.cache_folder, global_conf)
         cache_folder = cache.store  # Note, this is not the home, but the actual package cache
@@ -191,7 +195,7 @@ def save(self, package_list, tgz_path, no_source=False):
                        compresslevel, recursive=True)
         remove(pkglist_path)
 
-    def restore(self, path):
+    def restore(self, path) -> PackagesList:
         if not os.path.isfile(path):
             raise ConanException(f"Restore archive doesn't exist in {path}")
 
@@ -263,11 +267,14 @@ def restore(self, path):
 
     def get_backup_sources(self, package_list=None, exclude=True, only_upload=True):
         """Get list of backup source files currently present in the cache,
-        either all of them if no argument, or filtered by those belonging to the references in the package_list
-
-        @param package_list: a PackagesList object to filter backup files from (The files should have been downloaded form any of the references in the package_list)
-        @param exclude: if True, exclude the sources that come from URLs present the core.sources:exclude_urls global conf
-        @param only_upload: if True, only return the files for packages that are set to be uploaded
+        either all of them if no argument, or filtered by those belonging to the references
+        in the package_list
+
+        :param package_list: a PackagesList object to filter backup files from (The files should
+          have been downloaded form any of the references in the package_list)
+        :param exclude: if True, exclude the sources that come from URLs present the
+          core.sources:exclude_urls global conf
+        :param only_upload: if True, only return the files for packages that are set to be uploaded
         """
         config = self._api_helpers.global_conf
         download_cache_path = config.get("core.sources:download_cache")