Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix serialization of tool_requires in conan profile show --format=json #15185

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions conans/model/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ def __repr__(self):
return self.dumps()

def serialize(self):
# TODO: Remove it seems dead
def _serialize_tool_requires():
return {pattern: [ref.serialize() for ref in refs]
for pattern, refs in self.tool_requires.items()}
return {
"settings": self.settings,
"package_settings": self.package_settings,
"options": self.options.serialize(),
"tool_requires": self.tool_requires,
"tool_requires": _serialize_tool_requires(),
"conf": self.conf.serialize(),
# FIXME: Perform a serialize method for ProfileEnvironment
"build_env": self.buildenv.dumps()
Expand Down
9 changes: 9 additions & 0 deletions conans/model/recipe_ref.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,15 @@ def matches(self, pattern, is_consumer):
return not condition
return condition

def serialize(self):
result = {"name": self.name,
"version": str(self.version),
"user": self.user,
"channel": self.channel,
"revision": self.revision,
"timestamp": self.timestamp}
return result


def ref_matches(ref, pattern, is_consumer):
if not ref or not str(ref):
Expand Down
9 changes: 7 additions & 2 deletions conans/test/integration/command/test_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,14 @@ def test_shorthand_syntax():

def test_profile_show_json():
c = TestClient()
c.save({"myprofilewin": "[settings]\nos=Windows",
c.save({"myprofilewin": "[settings]\nos=Windows\n[tool_requires]\nmytool/*:mytool/1.0",
"myprofilelinux": "[settings]\nos=Linux"})
c.run("profile show -pr:b=myprofilewin -pr:h=myprofilelinux --format=json")
profile = json.loads(c.stdout)
assert profile["build"]["settings"] == {"os": "Windows"}
assert profile["host"]["settings"] == {"os": "Linux"}

assert profile["build"]["settings"] == {"os": "Windows"}
# Check that tool_requires are properly serialized in json format
# https://github.com/conan-io/conan/issues/15183
result = {'mytool/*': [{'channel': None, 'name': 'mytool', 'revision': None, 'timestamp': None, 'user': None, 'version': '1.0'}]}
assert profile["build"]["tool_requires"] == result