PyProd 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

pyprod/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.0"

pyprod/main.py

@@ -22,7 +22,7 @@ parser.add_argument(
 )
 
 parser.add_argument(
-    "-f", "--file", help="Use FILE as the Prodfile (default: 'PRODFILE.py')"
+    "-f", "--file", help="Use FILE as the Prodfile (default: 'Prodfile.py')"
 )
 
 parser.add_argument(
@@ -36,6 +36,15 @@ parser.add_argument(
 parser.add_argument(
     "-r", "--rebuild", dest="rebuild", action="store_true", help="Rebuild all"
 )
+
+parser.add_argument(
+    "-g",
+    "--use-git",
+    dest="use_git",
+    action="store_true",
+    help="Get file timestamps from Git",
+)
+
 parser.add_argument(
     "-v",
     dest="verbose",
@@ -44,6 +53,15 @@ parser.add_argument(
     help="Increase verbosity level (default: 0)",
 )
 
+parser.add_argument(
+    "-V",
+    "--version",
+    dest="version",
+    action="store_true",
+    default=0,
+    help="Show version",
+)
+
 
 parser.add_argument("targets", nargs="*", help="Build targets")
 
@@ -65,6 +83,10 @@ def init_args(args=None):
 
 def main():
     args = init_args()
+    if args.version:
+        print(f"PyProd {pyprod.__version__}")
+        sys.exit(0)
+
     pyprod.verbose = args.verbose
     chdir = args.directory
     if chdir:
@@ -108,7 +130,6 @@ def main():
     try:
         # load module
         prod = pyprod.prod.Prod(mod, args.job, params)
-
         # select targets
         if not targets:
             target = prod.get_default_target()

pyprod/prod.py

@@ -15,8 +15,9 @@ from collections import defaultdict
 from collections.abc import Collection
 from dataclasses import dataclass, field
 from fnmatch import fnmatch, translate
+from functools import wraps
 from pathlib import Path
-
+import dateutil.parser
 import pyprod
 
 from .utils import flatten, unique_list
@@ -103,9 +104,10 @@ def capture(*args, echo=True, cwd=None, check=True, text=True, shell=None):
 
 def glob(path, dir="."):
     ret = []
-    for c in Path(dir).glob(path):
+    root = Path(dir)
+    for c in root.glob(path):
         # ignore dot files
-        if any(p.startswith(".") for p in c.parts):
+        if any((p not in (".", "..")) and p.startswith(".") for p in c.parts):
             continue
         ret.append(c)
     return ret
@@ -175,6 +177,8 @@ def _name_to_str(name):
             return str(name)
         case str():
             return name
+        case _:
+            raise ValueError(f"Invalid dependency name: {name}")
 
     return name
 
@@ -182,6 +186,7 @@ def _name_to_str(name):
 class Rule:
     def __init__(self, targets, pattern=None, depends=(), uses=(), builder=None):
         self.targets = []
+        self.default = False
         self.first_target = None
         if targets:
             for target in flatten(targets):
@@ -211,6 +216,9 @@ class Rule:
 
         self.depends = []
         for depend in flatten(depends or ()):
+            if not depend:
+                continue
+
             depend = _name_to_str(depend)
             _check_pattern_count(depend)
             _check_wildcard(depend)
@@ -218,6 +226,9 @@ class Rule:
 
         self.uses = []
         for use in flatten(uses or ()):
+            if not use:
+                continue
+
             use = _name_to_str(use)
             _check_pattern_count(use)
             _check_wildcard(use)
@@ -239,18 +250,23 @@ class _TaskFunc:
         return self.f(*args, **kwargs)
 
 
-def default_builder(self, *args, **kwargs):
+def default_builder(*args, **kwargs):
     # default builder
     pass
 
 
 class Task(Rule):
-    def __init__(self, name, depends, uses, func=None):
-        super().__init__((), pattern=None, depends=depends, uses=uses, builder=func)
-        self.name = _name_to_str(name)
+    def __init__(self, name, uses, default, func=None):
+        super().__init__((), pattern=None, depends=(), uses=uses, builder=func)
         if name:
-            self.targets = [name]
-            self.first_target = self.name
+            self.name = _name_to_str(name)
+            if name:
+                self.targets = [name]
+                self.first_target = self.name
+        else:
+            self.name = None
+
+        self.default = default
         if func:
             self._set_funcname(func)
         if not self.builder:
@@ -292,10 +308,10 @@ class Rules:
         self.rules.append(dep)
         return dep
 
-    def add_task(self, name=None, depends=(), uses=(), func=None):
+    def add_task(self, name=None, uses=(), default=False, func=None):
         if self.frozen:
             raise RuntimeError("No new rule can be added after initialization")
-        dep = Task(name, depends, uses, func)
+        dep = Task(name, uses, default, func)
         self.rules.append(dep)
         return dep
 
@@ -306,12 +322,12 @@ class Rules:
         dep = self.add_rule([targets], pattern, depends, uses, None)
         return dep
 
-    def task(self, func=None, *, name=None, depends=(), uses=()):
+    def task(self, func=None, *, name=None, uses=(), default=False):
         if func:
             if not callable(func):
                 raise ValueError(f"{func} is not callable")
 
-        dep = self.add_task(name, depends, uses, func)
+        dep = self.add_task(name, uses, default, func)
         return dep
 
     def iter_rule(self, name):
@@ -353,10 +369,16 @@ class Rules:
         return unique_list(ret_depends), unique_list(ret_uses)
 
     def select_first_target(self):
+        first = None
         for dep in self.rules:
+            if dep.default and (not first):
+                first = dep.name
+
             if dep.first_target:
                 return dep.first_target
 
+        return first
+
     def select_builder(self, name):
         for depends, uses, dep in self.iter_rule(name):
             if not dep.builder:
@@ -419,10 +441,6 @@ class Checkers:
 MAX_TS = 1 << 63
 
 
-def is_file_exists(name):
-    return os.path.getmtime(name)
-
-
 class Exists:
     def __init__(self, name, exists, ts=None):
         self.name = name
@@ -506,10 +524,12 @@ class Prod:
         self.rules = Rules()
         self.checkers = Checkers()
         if njobs > 1:
-            self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=njobs)
+            self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=100)
         else:
             self.executor = None
         self.params = Params(params)
+        self.use_git_timestamp = pyprod.args.use_git
+
         self.buildings = {}
         self.module = None
         if self.modulefile:
@@ -536,6 +556,7 @@ class Prod:
             "run": run,
             "shutil": shutil,
             "task": self.rules.task,
+            "use_git": self.use_git,
             "write": write,
             "MAX_TS": MAX_TS,
             "Path": Path,
@@ -567,6 +588,52 @@ class Prod:
 
         return ret
 
+    def get_file_mtime(self, name):
+        return os.path.getmtime(name)
+
+    def get_file_mtime_git(self, name):
+        ret = subprocess.check_output(
+            ["git", "log", "-1", "--format=%ai", "--", name], text=True
+        ).strip()
+        if not ret:
+            raise FileNotFoundError(f"{name} did not match any file in git")
+
+        # 2025-01-17 00:05:48 +0900
+        return dateutil.parser.parse(ret)
+
+    async def is_exists(self, name):
+        checker = self.checkers.get_checker(name)
+        try:
+            if checker:
+                ret = await self.run_in_executor(checker, name)
+            elif self.use_git_timestamp:
+                ret = await self.run_in_executor(self.get_file_mtime_git, name)
+            else:
+                ret = await self.run_in_executor(self.get_file_mtime, name)
+        except FileNotFoundError:
+            ret = False
+
+        if isinstance(ret, FileNotFoundError):
+            ret = False
+
+        if not ret:
+            return Exists(name, False)
+        if isinstance(ret, datetime.datetime):
+            ret = ret.timestamp()
+        if ret < 0:
+            ret = MAX_TS
+        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
+
+    def use_git(self, use):
+        self.use_git_timestamp = use
+
     def get_default_target(self):
         return self.rules.select_first_target()
 
@@ -581,24 +648,26 @@ class Prod:
         return self.built
 
     async def schedule(self, deps):
+        deps = list(flatten(deps))
         tasks = []
         waits = []
         for dep in deps:
             if dep not in self.buildings:
                 ev = asyncio.Event()
                 self.buildings[dep] = ev
-                task = self.run(dep)
-                tasks.append((dep, task))
+                coro = self.run(dep)
+                tasks.append((dep, coro))
                 waits.append(ev)
             else:
                 obj = self.buildings[dep]
                 if isinstance(obj, asyncio.Event):
                     waits.append(obj)
 
-        for dep, task in tasks:
+        results = await asyncio.gather(*(coro for _, coro in tasks))
+        for ret, (dep, _) in zip(results, tasks):
             ev = self.buildings[dep]
             try:
-                self.buildings[dep] = await task
+                self.buildings[dep] = ret
             finally:
                 ev.set()
 
@@ -614,27 +683,6 @@ class Prod:
             return max(ts)
         return 0
 
-    async def is_exists(self, name):
-        checker = self.checkers.get_checker(name)
-        try:
-            if checker:
-                ret = await self.run_in_executor(checker, name)
-            else:
-                ret = await self.run_in_executor(is_file_exists, name)
-        except FileNotFoundError:
-            ret = False
-
-        if not ret:
-            return Exists(name, False)
-        if isinstance(ret, datetime.datetime):
-            ret = ret.timestamp()
-        if ret < 0:
-            ret = MAX_TS
-        return Exists(name, True, ret)
-
-    def build(self, *deps):
-        self.deps[0:0] = [_name_to_str(name) for name in flatten(deps)]
-
     async def run(self, name):  # -> Any | int:
         name = _name_to_str(name)
         self.rules.build_tree(name)
@@ -645,11 +693,18 @@ class Prod:
             deps = deps + build_deps
             uses = uses + build_uses
 
-        ts = 0
+        tasks = []
         if deps:
-            ts = await self.schedule(deps)
+            deps_task = asyncio.create_task(self.schedule(deps))
+            tasks.append(deps_task)
         if uses:
-            await self.schedule(uses)
+            uses_task = self.schedule(uses)
+            tasks.append(uses_task)
+
+        await asyncio.gather(*tasks)
+        ts = 0
+        if deps:
+            ts = deps_task.result()
 
         if selected and isinstance(builder, Task):
             self.built += 1

pyprod/utils.py

@@ -1,13 +1,15 @@
 from collections.abc import Iterable
 
 
-def flatten(seq):
+def flatten(seq, ignore_none=True):
     if isinstance(seq, str) or (not isinstance(seq, Iterable)):
         yield seq
         return
 
     for item in seq:
         if isinstance(item, str) or (not isinstance(item, Iterable)):
+            if ignore_none and (item is None):
+                continue
             yield item
         else:
             yield from flatten(item)

pyprod/venv.py

@@ -42,6 +42,15 @@ def pip(*args):
         makevenv(pyprod.modulefile)
     args = flatten(args)
     subprocess.run(
-        [venvdir / "bin/python", "-m", "pip", "--no-input", "install", *args],
+        [
+            venvdir / "bin/python",
+            "-m",
+            "pip",
+            "--disable-pip-version-check",
+            "--no-input",
+            "install",
+            "-q",
+            *args,
+        ],
         check=True,
     )

{pyprod-0.4.0.dist-info → pyprod-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyProd
-Version: 0.4.0
+Version: 0.6.0
 Summary: PyProd: More Makeable than Make
 Project-URL: Homepage, https://github.com/atsuoishimoto/pyprod
 Project-URL: Documentation, https://pyprod.readthedocs.io/en/latest/
@@ -12,6 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Build Tools
 Requires-Python: >=3.10
+Requires-Dist: python-dateutil
 Description-Content-Type: text/x-rst
 
 PyProd - More Makeable than Make

pyprod-0.6.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+pyprod/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
+pyprod/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
+pyprod/main.py,sha256=SWMmGVnVALwgENHmFfrTnYJcNyjWjw_qSO3o4aGre4E,3169
+pyprod/prod.py,sha256=Msuqe914lblxBAx_bP6_-P2ZCHrYyn-9qplMWvkg45s,20103
+pyprod/utils.py,sha256=6bA06MtxvzcEArAozeJVMgCvoTT185OPEGypM1jjoG0,481
+pyprod/venv.py,sha256=ZNMtHDBdC-eNFJE0-GxDlh6tlGy5Y-2m1r86SqxJJR0,1229
+pyprod-0.6.0.dist-info/METADATA,sha256=MNlfNV0nd0ikLscGAQFp_r8B5fsG4Xe-d7pS4Pyj-cE,2683
+pyprod-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyprod-0.6.0.dist-info/entry_points.txt,sha256=zFycf8BYSMRDTiI0jftmcvtkf9XM4MZ4BL3JaIer_ZM,44
+pyprod-0.6.0.dist-info/licenses/LICENSE,sha256=OtPgwnlLrsVEYPnTraun5AqftAT5vUv4rIan-qYj7nE,1071
+pyprod-0.6.0.dist-info/RECORD,,

pyprod-0.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-pyprod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyprod/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-pyprod/main.py,sha256=w8xm7Dz4eXF6D6FhZuxlPfU24KpnXciJLuAMT6_y3zI,2808
-pyprod/prod.py,sha256=Vu376JyNqiieCMy8jVvBml3TAf32Pq4XxSdpC4bBdgY,18424
-pyprod/utils.py,sha256=hvqeZhXyVAsHAdPUG6LhBOs2dMVXuDUWBYiIPBcsoKw,391
-pyprod/venv.py,sha256=lRTYxvtX876FQ9-bTYmsOHYV3nuMkKHO5hTLog0iHro,1085
-pyprod-0.4.0.dist-info/METADATA,sha256=zkpPbp07U627hgqWE6yDYGe_dZEDQTCiE3FidIfQ5mM,2652
-pyprod-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyprod-0.4.0.dist-info/entry_points.txt,sha256=zFycf8BYSMRDTiI0jftmcvtkf9XM4MZ4BL3JaIer_ZM,44
-pyprod-0.4.0.dist-info/licenses/LICENSE,sha256=OtPgwnlLrsVEYPnTraun5AqftAT5vUv4rIan-qYj7nE,1071
-pyprod-0.4.0.dist-info/RECORD,,