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.

Sign up for GitHub

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

Jump to bottom

Add repository and path properties to conan_build_info --v2 #8436

Merged
merged 11 commits into from Feb 5, 2021
Merged

Add repository and path properties to conan_build_info --v2 #8436

Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58ef494
change name and version
czoido Feb 3, 2021
fc7e10d
update tests
czoido Feb 3, 2021
53b7f3c
add conan type
czoido Feb 3, 2021
9aced75
update tests
czoido Feb 3, 2021
9c1dd3e
add path and repository properties
czoido Feb 3, 2021
b1d9285
Merge branch 'develop' of github.com:conan-io/conan into bi/add_path_…
czoido Feb 4, 2021
2791b83
minor changes
czoido Feb 4, 2021
8fbae66
merge path and repo
czoido Feb 5, 2021
f248fc4
simplify test
czoido Feb 5, 2021
a6dd197
reset timestamp
czoido Feb 5, 2021
71e665e
fix test
czoido Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
74 changes: 44 additions & 30 deletions conans/build_info/build_info.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
from conans import __version__


class Artifact(namedtuple('Artifact', ["sha1", "md5", "name", "id"])):
class Artifact(namedtuple('Artifact', ["sha1", "md5", "name", "id", "path"])):
def __hash__(self):
return hash(self.sha1)

Expand Down Expand Up @@ -72,7 +72,7 @@ def _get_package_reference(self, ref, pid, prev):
return "{reference}:{pid}{package_rev}".format(reference=self._get_reference(ref), pid=pid,
package_rev=package_rev)

def _get_metadata_artifacts(self, metadata, request_path, use_id=False, name_format="{}",
def _get_metadata_artifacts(self, metadata, ref_path, use_id=False, name_format="{}",
package_id=None):
ret = {}
need_sources = False
Expand All @@ -86,15 +86,17 @@ def _get_metadata_artifacts(self, metadata, request_path, use_id=False, name_for
name_or_id = name_format.format(name)
ret[value["sha1"]] = {"md5": value["md5"],
"name": name_or_id if not use_id else None,
"id": name_or_id if use_id else None}
"id": name_or_id if use_id else None,
"path": ref_path if not use_id else None}

if need_sources:
remote_name = metadata.recipe.remote
remotes = self._conan_cache.registry.load_remotes()
remote_url = remotes[remote_name].url
parsed_uri = urlparse(remote_url)
base_url = "{uri.scheme}://{uri.netloc}/artifactory/api/storage/conan/".format(
uri=parsed_uri)
request_url = urljoin(base_url, "{}/conan_sources.tgz".format(request_path))
request_url = urljoin(base_url, "{}/conan_sources.tgz".format(ref_path))
if self._user and self._password:
response = requests.get(request_url, auth=(self._user, self._password))
elif self._apikey:
Expand All @@ -106,54 +108,62 @@ def _get_metadata_artifacts(self, metadata, request_path, use_id=False, name_for
data = response.json()
ret[data["checksums"]["sha1"]] = {"md5": data["checksums"]["md5"],
"name": "conan_sources.tgz" if not use_id else None,
"id": "conan_sources.tgz" if use_id else None}
"id": "conan_sources.tgz" if use_id else None,
"path": ref_path if not use_id else None}
return set([Artifact(k, **v) for k, v in ret.items()])

def _get_repo(self, ref):
metadata = self._get_metadata(ref)
remote_name = metadata.recipe.remote
remotes = self._conan_cache.registry.load_remotes()
remote_url = remotes[remote_name].url
return remote_url.split("/")[-1]

def _get_recipe_rev(self, ref):
return "#{}".format(ref.get("rrev")) if ref.get("rrev") and ref.get("rrev") != "0" else ""

def _get_user_channel(self, ref):
return "@{}/{}".format(ref.get("user"), ref.get("channel")) if ref.get("user") and \
ref.get("channel") else ""

def _get_recipe_artifacts(self, ref, is_dependency):
def _get_recipe_path(self, ref):
r = self.parse_ref(ref)
user_channel = self._get_user_channel(r)
recipe_rev = self._get_recipe_rev(r)
ref = "{name}/{version}{user_channel}{recipe_rev}".format(user_channel=user_channel,
recipe_rev=recipe_rev, **r)
reference = ConanFileReference.loads(ref)
package_layout = self._conan_cache.package_layout(reference)
metadata = package_layout.load_metadata()
name_format = "{} :: {{}}".format(self._get_reference(ref)) if is_dependency else "{}"
url = "{user}/{name}/{version}/{channel}/{rrev}/export".format(
path = "{user}/{name}/{version}/{channel}/{rrev}/export".format(
**r) if user_channel else "_/{name}/{version}/_/{rrev}/export".format(**r)
return path

return self._get_metadata_artifacts(metadata, url, name_format=name_format,
use_id=is_dependency)

def _get_package_artifacts(self, ref, pid, prev, is_dependency):
def _get_package_path(self, ref, pid, prev):
r = self.parse_ref(ref)
user_channel = self._get_user_channel(r)
recipe_rev = self._get_recipe_rev(r)
ref = "{name}/{version}{user_channel}{recipe_rev}".format(user_channel=user_channel,
recipe_rev=recipe_rev, **r)
reference = ConanFileReference.loads(ref)
path = "{user}/{name}/{version}/{channel}/{rrev}/package/{pid}/{prev}" if user_channel else \
"_/{name}/{version}/_/{rrev}/package/{pid}/{prev}"
path = path.format(pid=pid, prev=prev, **r)
return path

def _get_metadata(self, ref):
reference = ConanFileReference.loads(self._get_reference(ref))
package_layout = self._conan_cache.package_layout(reference)
metadata = package_layout.load_metadata()
if is_dependency:
name_format = "{} :: {{}}".format(self._get_package_reference(ref, pid, prev))
else:
name_format = "{}"
url = "{user}/{name}/{version}/{channel}/{rrev}/package/{pid}/{prev}" if user_channel else \
"_/{name}/{version}/_/{rrev}/package/{pid}/{prev}"
url = url.format(pid=pid, prev=prev, **r)
arts = self._get_metadata_artifacts(metadata, url, name_format=name_format,
return metadata

def _get_recipe_artifacts(self, ref, is_dependency):
metadata = self._get_metadata(ref)
name_format = "{} :: {{}}".format(self._get_reference(ref)) if is_dependency else "{}"
ref_path = self._get_recipe_path(ref)
return self._get_metadata_artifacts(metadata, ref_path, name_format=name_format, use_id=is_dependency)

def _get_package_artifacts(self, ref, pid, prev, is_dependency):
metadata = self._get_metadata(ref)
name_format = "{} :: {{}}".format(self._get_package_reference(ref, pid, prev)) if is_dependency else "{}"
ref_path = self._get_package_path(ref, pid, prev)
arts = self._get_metadata_artifacts(metadata, ref_path, name_format=name_format,
use_id=is_dependency, package_id=pid)
return arts

def process_lockfile(self):
modules = defaultdict(lambda: {"type": "conan",
"repository": None,
"id": None,
"artifacts": set(),
"dependencies": set()})
Expand Down Expand Up @@ -193,9 +203,12 @@ def _gather_transitive_packages(nid, contents):
if node.get("modified"): # Work only on generated nodes
# Create module for the recipe reference
recipe_key = self._get_reference(ref)
repository = self._get_repo(ref)
modules[recipe_key]["id"] = recipe_key
modules[recipe_key]["artifacts"].update(
self._get_recipe_artifacts(ref, is_dependency=False))
modules[recipe_key]["repository"] = repository

# TODO: what about `python_requires`?
# TODO: can we associate any properties to the recipe? Profile/options may
# TODO: be different per lockfile
Expand All @@ -205,6 +218,7 @@ def _gather_transitive_packages(nid, contents):
modules[package_key]["id"] = package_key
modules[package_key]["artifacts"].update(
self._get_package_artifacts(ref, pid, prev, is_dependency=False))
modules[package_key]["repository"] = repository

# Recurse requires
node_ids = node.get("requires", []) + node.get("build_requires", [])
Expand Down