diff --git a/src/packagedcode/conan.py b/src/packagedcode/conan.py index 86e6ae9335..763d87ebc5 100644 --- a/src/packagedcode/conan.py +++ b/src/packagedcode/conan.py @@ -72,7 +72,8 @@ def visit_Assign(self, node): if not node.targets or not isinstance(node.targets[0], ast.Name): return if not node.value or not ( - isinstance(node.value, ast.Constant) or isinstance(node.value, ast.Tuple) + isinstance(node.value, ast.Constant) + or isinstance(node.value, (ast.Tuple, ast.List)) ): return @@ -94,7 +95,7 @@ def visit_Assign(self, node): attribute_name = attribute_mapping[variable_name] if variable_name in ("topics", "requires", "license"): current_list = getattr(self, attribute_name) - if isinstance(values, ast.Tuple): + if isinstance(values, (ast.Tuple, ast.List)): current_list.extend( [el.value for el in values.elts if isinstance(el, ast.Constant)] ) @@ -132,12 +133,18 @@ def _parse(cls, conan_recipe, package_only=False): for node in tree.body if isinstance(node, ast.ClassDef) and node.bases - and isinstance(node.bases[0], ast.Name) - and node.bases[0].id == "ConanFile" + and any( + (isinstance(base, ast.Name) and base.id == "ConanFile") + or (isinstance(base, ast.Attribute) and base.attr == "ConanFile") + for base in node.bases + ) ), None, ) + if not recipe_class_def: + return + parser = ConanFileParser() parser.visit(recipe_class_def) except SyntaxError as e: @@ -170,7 +177,9 @@ def parse(cls, location, package_only=False): with io.open(location, encoding="utf-8") as loc: conan_recipe = loc.read() - yield cls._parse(conan_recipe, package_only) + package_data = cls._parse(conan_recipe, package_only) + if package_data: + yield package_data class ConanDataHandler(models.DatafileHandler): @@ -232,7 +241,7 @@ def assemble( conanfile_package_resource = conanfile_package_resource[0] conanfile_package_data = conanfile_package_resource.package_data - if conanfile_package_data: + if conanfile_package_data and conanfile_package_data[0]: conanfile_package_data = conanfile_package_data[0] package_data_dict["name"] = conanfile_package_data.get("name") @@ -274,6 +283,8 @@ def is_constraint_pinned(constraint): """ Checks if a constraint is pinned and it specifies an exact version. """ + if not constraint: + return False range_characters = {">", "<", "[", "]", ">=", "<="} return not any(char in range_characters for char in constraint) @@ -281,8 +292,14 @@ def is_constraint_pinned(constraint): def get_dependencies(requires): dependent_packages = [] for req in requires: - name, constraint = req.split("/", 1) - is_pinned = is_constraint_pinned(constraint) + if not req or not isinstance(req, str): + continue + if "/" in req: + name, constraint = req.split("/", 1) + else: + name = req + constraint = None + is_pinned = is_constraint_pinned(constraint) if constraint else False version = None if is_pinned: version = constraint diff --git a/tests/packagedcode/test_conan.py b/tests/packagedcode/test_conan.py index 27c8a8a4a3..e4f063b32a 100644 --- a/tests/packagedcode/test_conan.py +++ b/tests/packagedcode/test_conan.py @@ -204,3 +204,57 @@ def test_get_dependencies(): ] assert conan.get_dependencies(requires) == expected + + +def test_conanfile_qualified_base(): + recipe = """import conan +class MyPackage(conan.ConanFile): + name = "mypackage" + version = "1.0.0" + description = "Test package with qualified base" +""" + package_data = conan.ConanFileHandler._parse(recipe) + assert package_data is not None + assert package_data.name == "mypackage" + assert package_data.version == "1.0.0" + + +def test_conanfile_non_conanfile_or_empty_no_crash(): + assert conan.ConanFileHandler._parse("") is None + assert conan.ConanFileHandler._parse("# only comments") is None + assert conan.ConanFileHandler._parse("class NonConan: pass") is None + + +def test_conanfile_parse_yields_nothing_for_non_conanfile(tmp_path): + test_file = tmp_path / "conanfile.py" + test_file.write_text("x = 1\n", encoding="utf-8") + packages = list(conan.ConanFileHandler.parse(str(test_file))) + assert packages == [] + + +def test_conanfile_list_dependencies_topics_license(): + recipe = """from conan import ConanFile +class MyPackage(ConanFile): + name = "test_pkg" + version = "2.0.0" + requires = ["zlib/1.2.11", "fmt/8.1.1"] + topics = ["c++", "packaging"] + license = ["MIT"] +""" + package_data = conan.ConanFileHandler._parse(recipe) + assert package_data is not None + assert package_data.keywords == ["c++", "packaging"] + assert "MIT" in package_data.extracted_license_statement + assert package_data.declared_license_expression == "mit" + purls = [dep.purl for dep in package_data.dependencies] + assert purls == ["pkg:conan/zlib@1.2.11", "pkg:conan/fmt@8.1.1"] + + +def test_get_dependencies_without_slash(): + requires = ["zlib", "bzip2/1.0.8"] + deps = conan.get_dependencies(requires) + assert len(deps) == 2 + assert deps[0].purl == "pkg:conan/zlib" + assert deps[0].extracted_requirement is None + assert deps[1].purl == "pkg:conan/bzip2@1.0.8" + assert deps[1].extracted_requirement == "1.0.8"