-merged PR, minor changes

Author: ajohns

src/rez/cli/depends.py

@@ -8,28 +8,28 @@ def setup_parser(parser, completions=False):
         "-d", "--depth", type=int,
         help="dependency tree depth limit")
     parser.add_argument(
-        "--paths", type=str, default=None,
+        "--paths", type=str,
         help="set package search path")
     parser.add_argument(
-        "-b", "--build-requires", action="store_true", default=False,
-        help="Include build_requires")
+        "-b", "--build-requires", action="store_true",
+        help="Include build requirements")
     parser.add_argument(
-        "-p", "--private-build-requires", action="store_true", default=False,
-        help="Include private_build_requires")
+        "-p", "--private-build-requires", action="store_true",
+        help="Include private build requirements")
     parser.add_argument(
         "-g", "--graph", action="store_true",
         help="display the dependency tree as an image")
     parser.add_argument(
         "--pg", "--print-graph", dest="print_graph", action="store_true",
         help="print the dependency tree as a string")
     parser.add_argument(
-        "--wg", "--write-graph", dest="write_graph", type=str, metavar='FILE',
+        "--wg", "--write-graph", dest="write_graph", metavar='FILE',
         help="write the dependency tree to FILE")
     parser.add_argument(
         "-q", "--quiet", action="store_true",
         help="don't print progress bar or depth indicators")
     PKG_action = parser.add_argument(
-        "PKG", type=str,
+        "PKG",
         help="package that other packages depend on")
 
     if completions:

src/rez/package_search.py

@@ -55,31 +55,26 @@ def get_reverse_dependency_tree(package_name, depth=None, paths=None,
     lookup = defaultdict(set)
 
     for i, package_name_ in enumerate(package_names):
-        bar.next()
         it = iter_packages(name=package_name_, paths=paths)
         packages = list(it)
         if not packages:
             continue
 
         pkg = max(packages, key=lambda x: x.version)
         requires = []
-        if not build_requires and not private_build_requires:
-            requires = pkg.requires or []
-        else:
-            for variant in pkg.iter_variants():
-                requires += variant.get_requires(build_requires, private_build_requires)
-
-        requires = set(requires)
 
-        for req_list in (pkg.variants or []):
-            requires.update(req_list)
+        for variant in pkg.iter_variants():
+            requires += variant.get_requires(build_requires, private_build_requires)
 
         for req in requires:
             if not req.conflict:
                 lookup[req.name].add(package_name_)
 
-    # perform traversal
+        bar.next()
+
     bar.finish()
+
+    # perform traversal
     n = 0
     consumed = set([package_name])
     working_set = set([package_name])

src/rez/utils/_version.py

@@ -1,7 +1,7 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.16.0"
+_rez_version = "2.17.0"
 
 try:
     from rez.vendor.version.version import Version