Merge branch 'develop2' into refactor/hook_manager_api

Author: memsharded

conan/api/conan_api.py

@@ -32,6 +32,10 @@ class ConanAPI:
     not be created directly.
     """
     def __init__(self, cache_folder=None):
+        """
+        :param cache_folder: Conan cache/home folder. It will have less priority than the
+                             "home_folder" defined in a Workspace.
+        """
 
         version = sys.version_info
         if version.major == 2 or version.minor < 6:

conan/internal/conan_app.py

@@ -1,7 +1,9 @@
 import os
 
+from conan.internal.api.local.editable import EditablePackages
 from conan.internal.cache.cache import PkgCache
 from conan.internal.cache.home_paths import HomePaths
+from conan.internal.model.conf import ConfDefinition
 from conans.client.graph.proxy import ConanProxy
 from conans.client.graph.python_requires import PyRequireLoader
 from conans.client.graph.range_resolver import RangeResolver
@@ -69,3 +71,22 @@ def __init__(self, conan_api):
         conanfile_helpers = ConanFileHelpers(conan_api.remotes.requester, cmd_wrap, self.global_conf,
                                              self.cache, self.cache_folder)
         self.loader = ConanFileLoader(self.pyreq_loader, conanfile_helpers)
+
+
+class LocalRecipesIndexApp:
+    """
+    Simplified one, without full API, for the LocalRecipesIndex. Only publicly used fields are:
+    - cache
+    - loader (for the export phase of local-recipes-index)
+    The others are internally use by other collaborators
+    """
+    def __init__(self, cache_folder):
+        self.global_conf = ConfDefinition()
+        self.cache = PkgCache(cache_folder, self.global_conf)
+        self.remote_manager = RemoteManager(self.cache, auth_manager=None, home_folder=cache_folder)
+        editable_packages = EditablePackages()
+        self.proxy = ConanProxy(self, editable_packages)
+        self.range_resolver = RangeResolver(self, self.global_conf, editable_packages)
+        pyreq_loader = PyRequireLoader(self, self.global_conf)
+        helpers = ConanFileHelpers(None, CmdWrapper(""), self.global_conf, self.cache, cache_folder)
+        self.loader = ConanFileLoader(pyreq_loader, helpers)

conan/tools/env/environment.py

@@ -89,7 +89,7 @@ def dumps(self):
             result.append("{}=!".format(self._name))
         elif _EnvVarPlaceHolder in self._values:
             index = self._values.index(_EnvVarPlaceHolder)
-            for v in self._values[:index]:
+            for v in reversed(self._values[:index]):  # Reverse to prepend
                 result.append("{}=+{}{}{}".format(self._name, path, sep, v))
             for v in self._values[index+1:]:
                 result.append("{}+={}{}{}".format(self._name, path, sep, v))

conans/client/graph/graph_builder.py

@@ -137,7 +137,9 @@ def _conflicting_version(require, node,
         version_range = require.version_range
         prev_version_range = prev_require.version_range if prev_node is None else None
         if version_range:
-            # TODO: Check user/channel conflicts first
+            if require.ref.user != prev_require.ref.user or \
+                    require.ref.channel != prev_require.ref.channel:
+                raise GraphConflictError(node, require, prev_node, prev_require, base_previous)
             if prev_version_range is not None:
                 # It it is not conflicting, but range can be incompatible, restrict range
                 restricted_version_range = version_range.intersection(prev_version_range)
@@ -149,9 +151,10 @@ def _conflicting_version(require, node,
                     require.ref = prev_ref
                 else:
                     raise GraphConflictError(node, require, prev_node, prev_require, base_previous)
-
         elif prev_version_range is not None:
-            # TODO: Check user/channel conflicts first
+            if require.ref.user != prev_require.ref.user or \
+                    require.ref.channel != prev_require.ref.channel:
+                raise GraphConflictError(node, require, prev_node, prev_require, base_previous)
             if not prev_version_range.contains(require.ref.version, resolve_prereleases):
                 raise GraphConflictError(node, require, prev_node, prev_require, base_previous)
         else:

conans/client/rest_client_local_recipe_index.py

@@ -64,10 +64,8 @@ def __init__(self, remote, home_folder):
         local_recipes_index_path = os.path.join(local_recipes_index_path, remote.name, ".conan")
         repo_folder = self._remote.url
 
-        from conan.internal.conan_app import ConanApp
-        from conan.api.conan_api import ConanAPI
-        conan_api = ConanAPI(local_recipes_index_path)
-        self._app = ConanApp(conan_api)
+        from conan.internal.conan_app import LocalRecipesIndexApp
+        self._app = LocalRecipesIndexApp(local_recipes_index_path)
         self._hook_manager = HookManager(HomePaths(local_recipes_index_path).hooks_path)
         self._layout = _LocalRecipesIndexLayout(repo_folder)
 

test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py

@@ -150,14 +150,14 @@ def test_clang_visual_studio_generator(self, client):
         """ This is using the embedded ClangCL compiler, not the external one"""
         generator = "Visual Studio 17"
         client.run("create . --name=pkg --version=0.1 -pr=clang -s compiler.runtime=dynamic "
-                   "-s compiler.cppstd=17 -s compiler.runtime_version=v143 "
+                   "-s compiler.cppstd=17 -s compiler.runtime_version=v144 "
                    '-c tools.cmake.cmaketoolchain:generator="{}"'.format(generator))
         assert 'cmake -G "{}"'.format(generator) in client.out
         assert "MSVC-like command-line" in client.out
-        # My local is 17, but CI ClangCL still 16
-        assert "main __clang_major__18" in client.out
+        assert "main __clang_major__19" in client.out
         # Check this! Clang compiler in Windows is reporting MSC_VER and MSVC_LANG!
-        assert "main _MSC_VER1938" in client.out
+        # CI forced the installation of 19.38, seems to prevail there
+        assert "main _MSC_VER193" in client.out
         assert "main _MSVC_LANG201703" in client.out
         assert "main _M_X64 defined" in client.out
         assert "main __x86_64__ defined" in client.out

test/integration/graph/conflict_diamond_test.py

@@ -1,3 +1,5 @@
+import pytest
+
 from conan.test.assets.genconanfile import GenConanfile
 from conan.test.utils.tools import TestClient
 
@@ -68,3 +70,33 @@ def _game_conanfile(version, reverse=False):
         c.run("install --requires=engine/1.0  --requires=ai/1.0", assert_error=True)
         assert "Conflict between math/1.0.1 and math/1.0 in the graph"
         assert "Conflict originates from ai/1.0"
+
+
+@pytest.mark.parametrize("version_range", [True, False])
+def test_conflict_user(version_range):
+    # https://github.com/conan-io/conan/issues/17875
+    v = "[^1.0]" if version_range else "1.0"
+    c = TestClient(light=True)
+    c.save({"dep/conanfile.py": GenConanfile("dep", "1.0"),
+            "pkg/conanfile.py": GenConanfile("pkg", "1.0").with_requires(f"dep/{v}@user1"),
+            "app/conanfile.py": GenConanfile("app", "1.0").with_requires(f"pkg/{v}@user1",
+                                                                         f"dep/{v}@user2")})
+    c.run("create dep --user=user1")
+    c.run("create dep --user=user2")
+    c.run("create pkg --user=user1")
+    c.run("install app", assert_error=True)
+    assert f"Version conflict: Conflict between dep/{v}@user1 and dep/{v}@user2" in c.out
+
+
+def test_conflict_user_order():
+    # https://github.com/conan-io/conan/issues/17875
+    c = TestClient(light=True)
+    c.save({"dep/conanfile.py": GenConanfile("dep", "1.0"),
+            "pkg/conanfile.py": GenConanfile("pkg", "1.0").with_requires("dep/1.0@user1"),
+            "app/conanfile.py": GenConanfile("app", "1.0").with_requires("pkg/1.0@user1",
+                                                                         "dep/[>=1.0]@user2")})
+    c.run("create dep --user=user1")
+    c.run("create dep --user=user2")
+    c.run("create pkg --user=user1")
+    c.run("install app", assert_error=True)
+    assert "ERROR: Version conflict: Conflict between dep/1.0@user1 and dep/[>=1.0]@user2" in c.out

test/integration/workspace/test_workspace.py

@@ -9,7 +9,7 @@
 from conan.test.utils.scm import create_local_git_repo
 from conan.test.utils.test_files import temp_folder
 from conan.test.utils.tools import TestClient
-from conans.util.files import save
+from conans.util.files import save, save_files
 
 WorkspaceAPI.TEST_ENABLED = "will_break_next"
 
@@ -499,7 +499,6 @@ def root_conanfile(self):
                 "conanws.py": conanfilews})
         c.run("workspace add dep")
         c.run("workspace install -of=build")
-        print(c.out)
         files = os.listdir(os.path.join(c.current_folder, "build"))
         assert "conandeps.props" in files
 
@@ -524,3 +523,25 @@ def root_conanfile(self):
         c.run("workspace add dep")
         c.run("workspace install", assert_error=True)
         assert "ERROR: Conanfile in conanws.py shouldn't have 'requires'" in c.out
+
+
+def test_workspace_with_local_recipes_index():
+    c3i_folder = temp_folder()
+    recipes_folder = os.path.join(c3i_folder, "recipes")
+    zlib_config = textwrap.dedent("""
+       versions:
+         "1.2.11":
+           folder: all
+       """)
+    save_files(recipes_folder, {"zlib/config.yml": zlib_config,
+                                "zlib/all/conanfile.py": str(GenConanfile("zlib")),
+                                "zlib/all/conandata.yml": ""})
+
+    c = TestClient(light=True)
+    c.save({"conanws.yml": 'home_folder: "deps"'})
+    c.run(f'remote add local "{c3i_folder}"')
+
+    c.run("list zlib/1.2.11#* -r=local")
+    assert "zlib/1.2.11" in c.out  # It doesn't crash
+    c.run("list zlib/1.2.11#*")
+    assert "zlib/1.2.11" not in c.out

test/unittests/tools/env/test_env.py

@@ -368,6 +368,24 @@ def test_append(self):
             MyPath1+=(path)/my/path1
             """)
 
+    def test_append_multiple(self):
+        myprofile = textwrap.dedent("""
+            # define
+            MyVar1+=MyValue1
+            MyVar1+=MyValue2
+            MyPath1 +=(path)/my/path1
+            MyPath1 +=(path)/my/path2
+            """)
+
+        env = ProfileEnvironment.loads(myprofile)
+        text = env.dumps()
+        assert text == textwrap.dedent("""\
+            MyVar1+=MyValue1
+            MyVar1+=MyValue2
+            MyPath1+=(path)/my/path1
+            MyPath1+=(path)/my/path2
+            """)
+
     def test_prepend(self):
         myprofile = textwrap.dedent("""
             # define
@@ -382,6 +400,24 @@ def test_prepend(self):
             MyPath1=+(path)/my/path1
             """)
 
+    def test_prepend_multiple(self):
+        myprofile = textwrap.dedent("""
+           # define
+           MyVar1=+MyValue1
+           MyVar1=+MyValue2
+           MyPath1=+(path)/my/path1
+           MyPath1=+(path)/my/path2
+           """)
+
+        env = ProfileEnvironment.loads(myprofile)
+        text = env.dumps()
+        assert text == textwrap.dedent("""\
+           MyVar1=+MyValue1
+           MyVar1=+MyValue2
+           MyPath1=+(path)/my/path1
+           MyPath1=+(path)/my/path2
+           """)
+
     def test_combined(self):
         myprofile = textwrap.dedent("""
             MyVar1=+MyValue11
@@ -399,22 +435,73 @@ def test_combined(self):
             MyPath1+=(path)/my/path12
             """)
 
-    def test_combined2(self):
+    def test_combined_multiple(self):
+        myprofile = textwrap.dedent("""
+            MyVar1=+MyValue11
+            MyVar1=+MyValue12
+            MyVar1+=MyValue13
+            MyVar1+=MyValue14
+            MyPath1=+(path)/my/path11
+            MyPath1=+(path)/my/path12
+            MyPath1+=(path)/my/path13
+            MyPath1+=(path)/my/path12
+            """)
+
+        env = ProfileEnvironment.loads(myprofile)
+        text = env.dumps()
+        assert text == textwrap.dedent("""\
+            MyVar1=+MyValue11
+            MyVar1=+MyValue12
+            MyVar1+=MyValue13
+            MyVar1+=MyValue14
+            MyPath1=+(path)/my/path11
+            MyPath1=+(path)/my/path12
+            MyPath1+=(path)/my/path13
+            MyPath1+=(path)/my/path12
+            """)
+
+    def test_combined_prepend_first(self):
+        myprofile = textwrap.dedent("""
+            MyVar1+=MyValue11
+            MyVar1=+MyValue12
+            MyPath1+=(path)/my/path11
+            MyPath1=+(path)/my/path12
+            """)
+
+        env = ProfileEnvironment.loads(myprofile)
+        text = env.dumps()
+        # NOTE: This is reversed order compared to origin, prepend always first
+        assert text == textwrap.dedent("""\
+            MyVar1=+MyValue12
+            MyVar1+=MyValue11
+            MyPath1=+(path)/my/path12
+            MyPath1+=(path)/my/path11
+            """)
+
+    def test_combined_prepend_first_multiple(self):
         myprofile = textwrap.dedent("""
             MyVar1+=MyValue11
             MyVar1=+MyValue12
+            MyVar1+=MyValue13
+            MyVar1=+MyValue14
             MyPath1+=(path)/my/path11
             MyPath1=+(path)/my/path12
+            MyPath1+=(path)/my/path13
+            MyPath1=+(path)/my/path14
             """)
 
         env = ProfileEnvironment.loads(myprofile)
         text = env.dumps()
         # NOTE: This is reversed order compared to origin, prepend always first
         assert text == textwrap.dedent("""\
             MyVar1=+MyValue12
+            MyVar1=+MyValue14
             MyVar1+=MyValue11
+            MyVar1+=MyValue13
             MyPath1=+(path)/my/path12
+            MyPath1=+(path)/my/path14
             MyPath1+=(path)/my/path11
+            MyPath1+=(path)/my/path13
             """)