Merge pull request #503 from mulkieran/ignore-path-dependencies

Do not report path dependencies by default

dependency_management/_utils.py

@@ -152,12 +152,13 @@ def build_koji_repo_dict(crates, release):
     return koji_repo_dict
 
 
-def build_cargo_metadata(manifest_path):
+def build_cargo_metadata(manifest_path, *, skip_path=False):
     """
     Build a dict mapping crate to version spec from Cargo.toml.
 
     :param manifest_path: the path to the Cargo manifest file
     :type manifest_path: str or NoneType
+    :param bool skip_path: if True, skip path dependencies
     :returns: a dict mapping crate name to version specification
     :rtype: str * SimpleSpec
     """
@@ -180,10 +181,10 @@ def build_cargo_metadata(manifest_path):
     package = packages[0]
     dependencies = package["dependencies"]
 
-    result = {}
-    for item in dependencies:
-        # cargo-metadata insert spaces into "req" value; SimpleSpec constructor
-        # rejects specifications that contain spaces.
-        result[item["name"]] = SimpleSpec(item["req"].replace(" ", ""))
-
-    return result
+    # cargo-metadata insert spaces into "req" value; SimpleSpec constructor
+    # rejects specifications that contain spaces.
+    return {
+        item["name"]: SimpleSpec(item["req"].replace(" ", ""))
+        for item in dependencies
+        if not skip_path or not "path" in item
+    }

dependency_management/compare_fedora_versions

@@ -161,6 +161,15 @@ def main():
         help=help_text,
     )
 
+    help_text = "Do not ignore path dependencies"
+    parser.add_argument(
+        "--deny-path",
+        action="store_true",
+        dest="deny_path",
+        default=False,
+        help=help_text,
+    )
+
     help_text = "Allow partial version expressions in Cargo.toml (example 0.14)"
     parser.add_argument(
         "--allow-partial-versions",
@@ -196,7 +205,9 @@ def main():
         )
 
     # Read the dependency versions specified in Cargo.toml
-    explicit_dependencies = build_cargo_metadata(args.manifest_path)
+    explicit_dependencies = build_cargo_metadata(
+        args.manifest_path, skip_path=not args.deny_path
+    )
 
     # Build koji dict
     try: