moat-src 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

moat/src/_main.py

@@ -9,6 +9,7 @@ import sys
 from collections import defaultdict, deque
 from configparser import RawConfigParser
 from pathlib import Path
+from copy import deepcopy
 
 import asyncclick as click
 import git
@@ -188,7 +189,7 @@ class Package(_Common):
             lc = self.last_commit
         except AttributeError:
             return True
-        for d in head.diff(self.last_commit, paths=Path("packaging")/self.dash if main else self.path):
+        for d in head.diff(self.last_commit, paths=self.path if main else Path("packaging")/self.dash):
             if (
                 self._repo.repo_for(d.a_path, main) != self.name
                 and self._repo.repo_for(d.b_path, main) != self.name
@@ -224,11 +225,16 @@ class Repo(git.Repo, _Common):
         self.moat_name = "-".join(p.parts[mi:])
         with open("versions.yaml") as f:
             self.versions = yload(f, attr=True)
+        self.orig_versions = deepcopy(self.versions)
+
 
     def write_tags(self):
+        if self.versions == self.orig_versions:
+            return False
         with open("versions.yaml", "w") as f:
             yprint(self.versions, f)
         self.index.add("versions.yaml")
+        return True
 
     @property
     def last_tag(self) -> Tag | None:
@@ -744,11 +750,11 @@ def tag(obj, run, minor, major, subtree, force, FORCE, show, build):
         r = repo
 
     if show:
-        tag = r.last_tag
+        tag = r.vers
         if r.has_changes():
-            print(f"{tag} STALE")
+            print(f"{tag.tag}-{tag.pkg} STALE")
         else:
-            print(tag)
+            print(f"{tag.tag}-{tag.pkg}")
         return
 
     if force:
@@ -770,10 +776,11 @@ def tag(obj, run, minor, major, subtree, force, FORCE, show, build):
                     pkg=1,
                     rev=repo.head.commit.hexsha,
                 )
+            print(f"{tag}-{sb.vers.pkg}")
             repo.write_tags()
         else:
             git.TagReference.create(repo, tag, force=FORCE)
-        print(f"{tag}")
+            print(f"{tag}")
     else:
         print(f"{tag} DRY_RUN")
 
@@ -902,6 +909,8 @@ async def build(
     # Step 1: check for changed files since last tagging
     if autotag:
         for r in repos:
+            if r.name == "moat.src":
+                breakpoint()
             if r.has_changes(True):
                 try:
                     nt = r.next_tag()
@@ -949,7 +958,7 @@ async def build(
         fails = set()
         for p in parts:
             if not run_tests(p, *pytest_opts):
-                fails.add(p.name)
+                fails.add(p)
         if fails:
             if not run:
                 print("*** Tests failed:", *fails, file=sys.stderr)
@@ -1070,9 +1079,10 @@ async def build(
             targz = rd / "dist" / f"{r.under}-{tag}.tar.gz"
             done = rd / "dist" / f"{r.under}-{tag}.done"
 
-            if targz.is_file():
-                if not done.exists():
-                    up.add(r)
+            if done.exists():
+                pass
+            elif targz.is_file():
+                up.add(r)
             else:
                 try:
                     subprocess.run(["python3", "-mbuild", "-snw"], cwd=rd, check=True)
@@ -1152,11 +1162,7 @@ async def build(
 
     # Step 8: commit the result
     if run:
-        for r in repos:
-            r.vers.rev = repo.head.commit.hexsha
-        repo.write_tags()
-
-        if not no_commit:
+        if repo.write_tags() and not no_commit:
             repo.index.commit(f"Build version {forcetag}")
             git.TagReference.create(repo, forcetag)
 

{moat_src-0.9.0.dist-info → moat_src-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.9.0
+Version: 0.9.1
 Summary: Tools for managing the MoaT sources
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org

{moat_src-0.9.0.dist-info → moat_src-0.9.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 moat/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moat/src/_cfg.yaml,sha256=bXRcamFBn1VCc7MhGBiWK5ciq4qw6iXyZzRJWvs_m0Q,35
-moat/src/_main.py,sha256=sWI450D4sZzPXs3vXE_444kx8_4vKThSJru6a1qu_kY,34903
+moat/src/_main.py,sha256=tT2fvYD0VXvP3bePwHCZV9lQXCrip7vRta-fMbA9dwM,35145
 moat/src/inspect.py,sha256=rUU-FQyQoQP8LJCebbtdL6lgzz9KPH7KGSq11kD4nmU,1489
 moat/src/test.py,sha256=rA-YV_VDwtfBk-bzIEa31fk9GHl6V8f4HTXejLoAAbk,2187
 moat/src/_templates/moat/__init__.py,sha256=ZBoFcXbv35djD599Vo_PKTqDjvQXYYXTcPUs5RcQZrs,101
 moat/src/_templates/moat/_main.py,sha256=8gLupAmWb5T6wLkQYTi99V1nyaS8cAIccwxHet2ydFw,321
 moat/src/_templates/packaging/pyproject.default.yaml,sha256=nHUa7dQhe8QpDH9Gbmjflf3BI3ECk2cuXArf0oPCgeg,2801
 moat/src/_templates/packaging/pyproject.forced.yaml,sha256=djfcy3hgfoIgrn2pRrxDWTyN3EEsA1y5NhkzYrGjgNY,1427
-moat_src-0.9.0.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_src-0.9.0.dist-info/METADATA,sha256=KZCUXs_GJPXgI9SSg88i4hErM5wiL_sjcHPukyixhjw,733
-moat_src-0.9.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-moat_src-0.9.0.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_src-0.9.0.dist-info/RECORD,,
+moat_src-0.9.1.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_src-0.9.1.dist-info/METADATA,sha256=79RMw2oRZlqebQqQIsSO8ziG1EKnel9T_6hSz5km7-M,733
+moat_src-0.9.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_src-0.9.1.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_src-0.9.1.dist-info/RECORD,,