PyProd 0.7.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

pyprod/__init__.py

@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.9.0"

pyprod/main.py

@@ -137,10 +137,7 @@ def main():
                 sys.exit("No default target")
             targets = [target]
 
-        ret = 0
-        for target in targets:
-            ret += asyncio.run(prod.start([target]))
-
+        ret = asyncio.run(prod.start(targets))
         if not ret:
             print(f"Nothing to be done for {targets}")
 

pyprod/prod.py

@@ -240,8 +240,9 @@ class Rule:
             if not depend:
                 continue
 
-            depend = _name_to_str(depend)
-            _check_pattern_count(depend)
+            if not callable(depend):
+                depend = _name_to_str(depend)
+                _check_pattern_count(depend)
             self.depends.append(depend)
 
         self.uses = []
@@ -249,9 +250,10 @@ class Rule:
             if not use:
                 continue
 
-            use = _name_to_str(use)
-            _check_pattern_count(use)
-            _check_wildcard(use)
+            if not callable(use):
+                use = _name_to_str(use)
+                _check_pattern_count(use)
+                _check_wildcard(use)
             self.uses.append(use)
 
         self.builder = builder
@@ -365,9 +367,25 @@ class Rules:
                         if m:
                             stem = m.groupdict().get("stem", None)
 
+                    depends = []
+                    for d in dep.depends:
+                        if callable(d):
+                            ret = flatten([d(name, stem)], ignore_none=True)
+                            depends.extend(ret)
+                        else:
+                            depends.append(d)
+
+                    uses = []
+                    for u in dep.uses:
+                        if callable(u):
+                            ret = flatten([u(name, stem)], ignore_none=True)
+                            uses.extend(ret)
+                        else:
+                            uses.append(u)
+
                     if stem is not None:
-                        depends = [replace_pattern(r, stem) for r in dep.depends]
-                        uses = [replace_pattern(r, stem) for r in dep.uses]
+                        depends = [replace_pattern(r, stem) for r in depends]
+                        uses = [replace_pattern(r, stem) for r in uses]
                     else:
                         depends = dep.depends[:]
                         uses = dep.uses[:]
@@ -557,6 +575,8 @@ class Prod:
             self.module = self.load_pyprodfile(self.modulefile)
         self.built = 0  # number of build execused
 
+        self.deps = []
+
     def get_module_globals(self):
         globals = {
             "build": self.build,
@@ -646,11 +666,8 @@ class Prod:
         return Exists(name, True, ret)
 
     def build(self, *deps):
-        children = []
-        for elem in deps:
-            child = [_name_to_str(name) for name in flatten(elem)]
-            children.append(child)
-        self.deps[0:0] = children
+        if deps:
+            self.deps[0:0] = deps
 
     def use_git(self, use):
         self.use_git_timestamp = use
@@ -661,10 +678,12 @@ class Prod:
     async def start(self, deps):
         self.loop = asyncio.get_running_loop()
         self.built = 0
-        self.deps = deps[:]
+        self.deps.append(deps)
         while self.deps:
+            tasks = []
             dep = self.deps.pop(0)
-            await self.schedule([dep])
+            tasks.append(self.schedule([dep]))
+            await asyncio.gather(*tasks)
 
         return self.built
 

{pyprod-0.7.0.dist-info → pyprod-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyProd
-Version: 0.7.0
+Version: 0.9.0
 Summary: PyProd: More Makeable than Make
 Project-URL: Homepage, https://github.com/atsuoishimoto/pyprod
 Project-URL: Documentation, https://pyprod.readthedocs.io/en/latest/

pyprod-0.9.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+pyprod/__init__.py,sha256=H9NWRZb7NbeRRPLP_V1fARmLNXranorVM-OOY-8_2ug,22
+pyprod/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
+pyprod/main.py,sha256=_JuQCgGAGIx_hRc4U2BtsXRfUNKaqhnM3TndsqNcOac,3115
+pyprod/prod.py,sha256=H6Ssxbh4p0Q7azB_st3qr1d3RwgIiqMekk_WSDt-xeg,21226
+pyprod/utils.py,sha256=6bA06MtxvzcEArAozeJVMgCvoTT185OPEGypM1jjoG0,481
+pyprod/venv.py,sha256=ZNMtHDBdC-eNFJE0-GxDlh6tlGy5Y-2m1r86SqxJJR0,1229
+pyprod-0.9.0.dist-info/METADATA,sha256=KUZ8WDr88krTBUUwXbFRiRnrV-FhsG7uYk7on-_lRJo,2683
+pyprod-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyprod-0.9.0.dist-info/entry_points.txt,sha256=zFycf8BYSMRDTiI0jftmcvtkf9XM4MZ4BL3JaIer_ZM,44
+pyprod-0.9.0.dist-info/licenses/LICENSE,sha256=OtPgwnlLrsVEYPnTraun5AqftAT5vUv4rIan-qYj7nE,1071
+pyprod-0.9.0.dist-info/RECORD,,

pyprod-0.7.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-pyprod/__init__.py,sha256=RaANGbRu5e-vehwXI1-Qe2ggPPfs1TQaZj072JdbLk4,22
-pyprod/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-pyprod/main.py,sha256=SWMmGVnVALwgENHmFfrTnYJcNyjWjw_qSO3o4aGre4E,3169
-pyprod/prod.py,sha256=RY1-DPE_W5BhAXDURDeJViddCDxyZ0JVSFd40vSJOFI,20555
-pyprod/utils.py,sha256=6bA06MtxvzcEArAozeJVMgCvoTT185OPEGypM1jjoG0,481
-pyprod/venv.py,sha256=ZNMtHDBdC-eNFJE0-GxDlh6tlGy5Y-2m1r86SqxJJR0,1229
-pyprod-0.7.0.dist-info/METADATA,sha256=mOcpnvRLrSdqN-p6U0U3EgXjX6L4dNg-w5H1XNAlPPg,2683
-pyprod-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyprod-0.7.0.dist-info/entry_points.txt,sha256=zFycf8BYSMRDTiI0jftmcvtkf9XM4MZ4BL3JaIer_ZM,44
-pyprod-0.7.0.dist-info/licenses/LICENSE,sha256=OtPgwnlLrsVEYPnTraun5AqftAT5vUv4rIan-qYj7nE,1071
-pyprod-0.7.0.dist-info/RECORD,,