moat-src 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

moat/src/_main.py

@@ -190,6 +190,8 @@ class Package(_Common):
         except AttributeError:
             return True
         for d in head.diff(self.last_commit, paths=self.path if main else Path("packaging")/self.dash):
+            if Path(d.b_path).name == "changelog":
+                continue
             if (
                 self._repo.repo_for(d.a_path, main) != self.name
                 and self._repo.repo_for(d.b_path, main) != self.name
@@ -1005,6 +1007,9 @@ async def build(
             deb_opts = ["--no-sign"]
 
         for r in repos:
+            ltag = r.last_tag
+            if r.vers.get("deb","-") == f"{ltag}-{r.vers.pkg}":
+                continue
             rd = PACK / r.dash
             p = rd / "debian"
             if not p.is_dir():
@@ -1033,7 +1038,6 @@ async def build(
                 )
                 tag,ptag = res.stdout.strip().decode("utf-8").rsplit("-", 1)
                 ptag = int(ptag)
-                ltag = r.last_tag
                 if tag != ltag or r.vers.pkg != ptag:
                     subprocess.run(
                         [
@@ -1073,6 +1077,8 @@ async def build(
                 continue
             tag = r.last_tag
             name = r.dash
+            if r.vers.get("pypi","-") == r.last_tag:
+                continue
 
             targz = rd / "dist" / f"{r.under}-{tag}.tar.gz"
             done = rd / "dist" / f"{r.under}-{tag}.done"
@@ -1128,6 +1134,8 @@ async def build(
                 print("Please fix(?) and try again.", file=sys.stderr)
                 no_commit=True
                 no_deb=True
+            else:
+                r.vers.pypi = r.last_tag
 
     # Step 7: upload Debian package
     if run and not no_deb:
@@ -1136,6 +1144,8 @@ async def build(
             dput_opts = ["-u", "ext"]
         for r in repos:
             ltag = r.last_tag
+            if r.vers.get("deb","-") == f"{ltag}-{r.vers.pkg}":
+                continue
             if not (PACK / r.dash / "debian").is_dir():
                 continue
             changes = PACK / f"{r.mdash}_{ltag}-{r.vers.pkg}_{ARCH}.changes"
@@ -1157,6 +1167,8 @@ async def build(
             print(*err, file=sys.stderr)
             print("Please fix(?) and try again.", file=sys.stderr)
             no_commit=True
+        else:
+            r.vers.deb = f"{ltag}-{r.vers.pkg}"
 
     # Step 8: commit the result
     if run:

{moat_src-0.9.2.dist-info → moat_src-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.9.2
+Version: 0.9.4
 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.2.dist-info → moat_src-0.9.4.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=S51OJxg2D_maDZXL8o3utB_oQj6xJaBu6gVfEIAGHss,35079
+moat/src/_main.py,sha256=H7bFpjHPHYjIoC8IYo2eFH33lH6kBlLgSX52oJGy7J4,35528
 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.2.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_src-0.9.2.dist-info/METADATA,sha256=Et-HEllEperfceY6IQQkkC4VFOsu0-bH4eJY9Pa8To0,733
-moat_src-0.9.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-moat_src-0.9.2.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_src-0.9.2.dist-info/RECORD,,
+moat_src-0.9.4.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_src-0.9.4.dist-info/METADATA,sha256=mU27ITaqmz3NTxEOyFoGUNxbOA5ziGfcidWKe43f1fk,733
+moat_src-0.9.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_src-0.9.4.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_src-0.9.4.dist-info/RECORD,,