Merge pull request #11 from davidlatwe/buildtime-variants

Buildtime variants

src/deliver/run.py

@@ -13,11 +13,22 @@ def main():
     parser.add_argument("--release", action="store_true")
     opts, remains = parser.parse_known_args()
 
+    # for case like:
+    #
+    #   `tests.test_manifest.TestManifest.test_buildtime_variants`
+    #
+    # which requires to scan packages to list out current available variants,
+    # we resolve the request here again and append loader paths for including
+    # developer packages in that scan.
+    #
     solver = RequestSolver()
     solver.resolve(opts.PKG)
 
+    # build/release
+    #
     settings = {
-        "packages_path": solver.installed_packages_path,
+        # developer packages loader paths appended, see comment above.
+        "packages_path": solver.installed_packages_path + solver.loader.paths,
     }
     with override_config(settings):
         command = "release" if opts.release else "build"

src/deliver/solve.py

@@ -65,6 +65,17 @@ def __repr__(self):
 variant_index_regex = re.compile(r"(.+)\[([0-9]+)]")
 
 
+def split_variant_request(request):
+    """Parse request string and split up variant index"""
+    result = variant_index_regex.split(request)
+    index = None
+    if not result[0]:
+        request, index = result[1:3]
+        index = int(index)
+
+    return PackageRequest(request), index
+
+
 class RequestSolver(object):
     """Package installation manifest resolver"""
 
@@ -127,13 +138,8 @@ def resolve(self, *requests):
 
         for request in requests:
             # parse variant index
-            result = variant_index_regex.split(request)
-            index = None
-            if not result[0]:
-                request, index = result[1:3]
-                index = int(index)
+            _request, index = split_variant_request(request)
             # filtering requests
-            _request = PackageRequest(request)
             if _request.conflict:
                 conflicts.append(request)
             else:

tests/test_manifest.py

@@ -259,13 +259,10 @@ def test_resolve_with_external(self):
     def test_buildtime_variants(self):
         @early()
         def variants():
+            from rez import packages
             bindings = ["pyqt", "pyside"]
-            if building:
-                return [[binding] for binding in bindings]
-            else:
-                from rez import packages
-                return [[binding] for binding in bindings
-                        if packages.get_latest_package_from_string(binding)]
+            return [[binding] for binding in bindings
+                    if packages.get_latest_package_from_string(binding)]
 
         self.dev_repo.add("shim", build_command=False, variants=variants)
         self.dev_repo.add("pyqt", build_command=False)