Skip to content

Commit

Permalink
Revert "fixing python_requires in buildInfo"
Browse files Browse the repository at this point in the history 
This reverts commit cce91f3.
  • Loading branch information
@danimtb
danimtb committed May 21, 2024
1 parent 0c895c2 commit c77bb83
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 141 deletions.
146 changes: 49 additions & 97 deletions extensions/commands/art/cmd_build_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def _get_local_artifacts():
file_list = list(dl_folder.glob("*"))
if len(file_list) >= 3:
for file_path in dl_folder.glob("*"):
if file_path.is_file(): # FIXME: Make it recursive for metadata folder
if file_path.is_file():
file_name = file_path.name
md5, sha1, sha256 = _get_hashes(file_path)
artifact_info = {"type": os.path.splitext(file_name)[1].lstrip('.'),
Expand Down Expand Up @@ -227,107 +227,59 @@ def _get_remote_artifacts():

return artifacts

def get_pyreq_artifacts(self, pyreq, pyref, is_dependency=False):
artifacts_folder = pyreq.get("path")
# this may happen for conan versions < 2.0.14, do not crash in that case
if artifacts_folder is None:
return
remote_path = _get_remote_path(pyref)
artifacts = []

dl_folder = Path(artifacts_folder).parents[0] / "d"
file_list = list(dl_folder.glob("*"))
for f in file_list:
if not f.is_file():
continue # FIXME: This is discarding metadata folders
md5, sha1, sha256 = _get_hashes(f)

artifact_info = {"type": os.path.splitext(f.name)[1].lstrip('.'),
"sha256": sha256,
"sha1": sha1,
"md5": md5}

if not is_dependency:
artifact_info.update({"name": f.name, "path": f'{self._repository}/{remote_path}/{f.name}'})
else:
artifact_info.update({"id": f"{pyref} :: {f.name}"})

artifacts.append(artifact_info)
return artifacts

def create_pyreq_modules(self, node):
python_requires = node.get("python_requires")
pyreq_modules = []
for pyref, pyreq in python_requires.items():

artifacts = self.get_pyreq_artifacts(pyreq, pyref)

module = {"type": "conan",
"id": pyref,
"artifacts": artifacts}
pyreq_modules.append(module)
return pyreq_modules

def create_module(self, node, module_type, transitive_dependencies=None, python_requires=None):
if module_type=="recipe" or (node.get("package_id") and node.get("prev") and module_type=="package"):
ref = node.get("ref")
module = {
"type": "conan",
"id": str(ref) if module_type=="recipe" else f'{str(ref)}:{node.get("package_id")}#{node.get("prev")}',
"artifacts": self.get_artifacts(node, module_type)
}

if transitive_dependencies or python_requires:
nodes = self._graph["graph"]["nodes"]
all_dependencies = []

if transitive_dependencies:
for require_id in transitive_dependencies:
deps_artifacts = self.get_artifacts(nodes.get(require_id), module_type, is_dependency=True)
all_dependencies.extend(deps_artifacts)

if python_requires:
for pyref, pyreq in python_requires.items():
pyreq_artifacts = self.get_pyreq_artifacts(pyreq, pyref, is_dependency=True)
all_dependencies.extend(pyreq_artifacts)

module.update({"dependencies": all_dependencies})

return module


def get_modules(self):
modules_list = []
ret = []
try:
nodes = self._graph["graph"]["nodes"]
except KeyError as e:
raise ConanException(f"JSON does not contain graph information: {e}")
except KeyError:
raise ConanException("JSON does not contain graph information")

for node in nodes.values():
for id, node in nodes.items():
ref = node.get("ref")
binary = node.get("binary")
dependencies = node.get("dependencies", {})

if ref and (binary == "Build" or (binary == "Cache" and self._add_cached_deps)):
transitive_dependencies = list(dependencies.keys()) if self._with_dependencies else None

# If the package that was built had a python_requires then add it as a separate module

python_requires = node.get("python_requires")
if python_requires:
modules = self.create_pyreq_modules(node)
modules_list.extend(modules)

# For each package that was built we create a recipe module and a package module
recipe_module = self.create_module(node, "recipe", transitive_dependencies, python_requires)
modules_list.append(recipe_module)


package_module = self.create_module(node, "package", transitive_dependencies)
modules_list.append(package_module)


return modules_list
if ref:
transitive_dependencies = node.get("dependencies").keys() if node.get("dependencies").keys() else []

# only add the nodes that were marked as built
if node.get("binary") == "Build":

# recipe module
module = {
"type": "conan",
"id": str(ref),
"artifacts": self.get_artifacts(node, "recipe")
}

if self._with_dependencies:
all_dependencies = []
for require_id in transitive_dependencies:
deps_artifacts = self.get_artifacts(nodes.get(require_id), "recipe",
is_dependency=True)
all_dependencies.extend(deps_artifacts)

module.update({"dependencies": all_dependencies})

ret.append(module)

# package module
if node.get("package_id") and node.get("prev"):
module = {
"type": "conan",
"id": f'{str(ref)}:{node.get("package_id")}#{node.get("prev")}',
"artifacts": self.get_artifacts(node, "package")
}
# get the dependencies and its artifacts
if self._with_dependencies:
all_dependencies = []
for require_id in transitive_dependencies:
deps_artifacts = self.get_artifacts(nodes.get(require_id), "package",
is_dependency=True)
all_dependencies.extend(deps_artifacts)

module.update({"dependencies": all_dependencies})

ret.append(module)

return ret

def header(self):
return {"version": "1.0.1",
Expand Down
44 changes: 0 additions & 44 deletions tests/test_artifactory_commands.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import json
import os
import tempfile
import textwrap

from tools import run, save
from conan.tools.scm import Version
Expand Down Expand Up @@ -236,48 +234,6 @@ def test_build_info_create_from_cached_deps():
assert len(build_info.get("modules")) == 2


@pytest.mark.requires_credentials
@pytest.mark.skipif(conan_version <= Version("2.0.13"), reason="path key is only added to python requires in graph for conan >= 2.0.14")
def test_build_info_create_python_requires():
build_name = "mybuildinfo"
build_number = "1"

run(f'conan art:server add artifactory {os.getenv("ART_URL")} --user="{os.getenv("CONAN_LOGIN_USERNAME_EXTENSIONS_STG")}" --password="{os.getenv("CONAN_PASSWORD_EXTENSIONS_STG")}"')

# Create dependency packages and upload them
pytool = textwrap.dedent("""\
from conan import ConanFile
class PyTool(ConanFile):
name = "pytool"
version = "0.1"
""")
save("conanfile.py", pytool)
run('conan create . ')
pkg = textwrap.dedent("""\
from conan import ConanFile
class PyTool(ConanFile):
name = "pkg"
version = "0.1"
python_requires = "pytool/0.1"
""")
save("conanfile.py", pkg)
run('conan create . --format=json > create_release.json')

run("conan upload '*' -c --dry-run -r=extensions-stg")
run(f'conan art:build-info create create_release.json {build_name}_release {build_number} extensions-stg --server artifactory --with-dependencies > {build_name}_release.json')
build_info = open("mybuildinfo_release.json").read()

build_info = json.loads(build_info)
assert "pytool/0.1#" in build_info["modules"][0]["id"]
artifacts = build_info["modules"][0]["artifacts"]
assert len(artifacts) == 2

artifact_names = [artifact["name"] for artifact in artifacts]

assert "conanfile.py" in artifact_names
assert "conanmanifest.txt" in artifact_names


@pytest.mark.requires_credentials
def test_fail_if_not_uploaded():
"""
Expand Down

0 comments on commit c77bb83

Please sign in to comment.