Skip to content

Commit

Permalink
Make skipped binaries prettier (#13919)
Browse files Browse the repository at this point in the history
* Make skipped binaries prettier

* Remove []

* Fix sneaky test I did not find previously
  • Loading branch information
AbrilRBS authored May 22, 2023
1 parent 10f1786 commit c00cd10
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion conan/cli/printers/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion conans/test/integration/graph/test_skip_binaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion conans/test/integration/toolchains/apple/test_xcodedeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c00cd10

Please sign in to comment.