moat-src 0.9.2__tar.gz → 0.9.4__tar.gz

{moat_src-0.9.2/src/moat_src.egg-info → moat_src-0.9.4}/PKG-INFO

@@ -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 → moat_src-0.9.4}/debian/changelog

@@ -1,3 +1,57 @@
+moat-src (0.9.4-1) unstable; urgency=medium
+
+  * New release for 25.3.2
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Fri, 23 May 2025 13:46:49 +0200
+
+moat-src (0.9.3-1) unstable; urgency=medium
+
+  * New release for 25.3.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Fri, 23 May 2025 13:13:49 +0200
+
+moat-src (0.9.2-8) unstable; urgency=medium
+
+  * New release for 25.3.0
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 20 May 2025 12:31:02 +0200
+
+moat-src (0.9.2-7) unstable; urgency=medium
+
+  * New release for 25.1.23
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Wed, 14 May 2025 07:29:26 +0200
+
+moat-src (0.9.2-6) unstable; urgency=medium
+
+  * New release for 25.1.22
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 13 May 2025 22:02:50 +0200
+
+moat-src (0.9.2-5) unstable; urgency=medium
+
+  * New release for 25.1.21
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 13 May 2025 21:47:51 +0200
+
+moat-src (0.9.2-4) unstable; urgency=medium
+
+  * New release for 25.1.20
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Tue, 13 May 2025 10:48:10 +0200
+
+moat-src (0.9.2-3) unstable; urgency=medium
+
+  * New release for 25.1.19
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 20:29:47 +0200
+
+moat-src (0.9.2-2) unstable; urgency=medium
+
+  * New release for 25.1.18
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 20:25:47 +0200
+
 moat-src (0.9.2-1) unstable; urgency=medium
 
   * New release for 25.1.17

{moat_src-0.9.2 → moat_src-0.9.4}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
 	"gitpython",
 	"packaging",
 	]
-version = "0.9.2"
+version = "0.9.4"
 keywords = [ "MoaT",]
 requires-python = ">=3.8"
 name = "moat-src"

{moat_src-0.9.2 → moat_src-0.9.4}/src/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 → moat_src-0.9.4/src/moat_src.egg-info}/PKG-INFO

@@ -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