From c00cd10c3d38f48c4edc1a63c444e7eeb5b769f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= Date: Mon, 22 May 2023 09:24:00 +0200 Subject: [PATCH] Make skipped binaries prettier (#13919) * Make skipped binaries prettier * Remove [] * Fix sneaky test I did not find previously --- conan/cli/printers/graph.py | 2 +- conans/test/integration/graph/test_skip_binaries.py | 2 +- conans/test/integration/toolchains/apple/test_xcodedeps.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conan/cli/printers/graph.py b/conan/cli/printers/graph.py index ac13b4019fb..07efd738a69 100644 --- a/conan/cli/printers/graph.py +++ b/conan/cli/printers/graph.py @@ -123,4 +123,4 @@ def _format_requires(title, reqs_to_print): if skipped_requires and not output.level_allowed(LEVEL_VERBOSE): output.info("Skipped binaries", Color.BRIGHT_YELLOW) - output.info(f"{tab}{skipped_requires}", Color.BRIGHT_CYAN) + output.info(f"{tab}{', '.join(skipped_requires)}", Color.BRIGHT_CYAN) diff --git a/conans/test/integration/graph/test_skip_binaries.py b/conans/test/integration/graph/test_skip_binaries.py index 19a89a6d6c5..0eae8817308 100644 --- a/conans/test/integration/graph/test_skip_binaries.py +++ b/conans/test/integration/graph/test_skip_binaries.py @@ -82,7 +82,7 @@ def test_test_requires(): client.save({"conanfile.py": GenConanfile().with_requires("pkg/1.0")}) # Checking list of skipped binaries client.run("create . --name=app --version=1.0") - assert re.search(r"Skipped binaries(\s*)\['gtest/1.0'\]", client.out) + assert re.search(r"Skipped binaries(\s*)gtest/1.0", client.out) # Showing the complete information about the skipped binary client.run("create . --name=app --version=1.0 -v") client.assert_listed_binary({"gtest/1.0": (package_id, "Skip")}, test=True) diff --git a/conans/test/integration/toolchains/apple/test_xcodedeps.py b/conans/test/integration/toolchains/apple/test_xcodedeps.py index fc43fbbd25b..e717bc25001 100644 --- a/conans/test/integration/toolchains/apple/test_xcodedeps.py +++ b/conans/test/integration/toolchains/apple/test_xcodedeps.py @@ -475,6 +475,6 @@ def test_skipped_not_included(): client.run("create dep --name=dep --version=0.1") client.run("create pkg --name=pkg --version=0.1") client.run("install consumer -g XcodeDeps -s arch=x86_64 -s build_type=Release") - assert re.search(r"Skipped binaries\n\s+(\[.*?\])", client.out, re.DOTALL) + assert re.search(r"Skipped binaries\n\s+(.*?)", client.out, re.DOTALL) dep_xconfig = client.load("consumer/conan_pkg_pkg.xcconfig") assert "conan_dep.xcconfig" not in dep_xconfig