moat-src 0.8.11__tar.gz → 0.9.1__tar.gz

{moat_src-0.8.11/src/moat_src.egg-info → moat_src-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.8.11
+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.8.11 → moat_src-0.9.1}/debian/changelog

@@ -1,3 +1,27 @@
+moat-src (0.9.1-1) unstable; urgency=medium
+
+  * New release for 25.1.16
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 18:06:09 +0200
+
+moat-src (0.9.0-2) unstable; urgency=medium
+
+  * New release for 25.1.14
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 17:39:09 +0200
+
+moat-src (0.9.0-1) unstable; urgency=medium
+
+  * New release for 25.2.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 12:24:05 +0200
+
+moat-src (0.8.11-2) unstable; urgency=medium
+
+  * New release for 25.2.1
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 12 May 2025 09:53:45 +0200
+
 moat-src (0.8.11-1) unstable; urgency=medium
 
   * New release for 25.2.1

{moat_src-0.8.11 → moat_src-0.9.1}/debian/control

@@ -12,7 +12,7 @@ Package: moat-src
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
   python3-anyio (>= 2.0),
-  moat-main,
+  moat,
 Recommends:
   moat-kv (>= 0.32),
   python3-trio (>= 0.17),

{moat_src-0.8.11 → moat_src-0.9.1}/pyproject.toml

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

moat_src-0.9.1/src/moat/src/_cfg.yaml

@@ -0,0 +1,2 @@
+toplevel: "moat"
+done: "/src/DONE"

{moat_src-0.8.11 → moat_src-0.9.1}/src/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
@@ -27,32 +28,18 @@ ARCH = subprocess.check_output(["dpkg", "--print-architecture"]).decode("utf-8")
 
 def dash(n: str) -> str:
     """
-    moat.foo.bar > foo-bar
-    foo.bar > ext-foo-bar
+    moat.foo.bar > moat-foo-bar
+    foo.bar > foo-bar
     """
-    if n in ("main", "moat"):
-        return "main"
-    if "." not in n:  # also applies to single-name packages
-        return n
-
-    if not n.startswith("moat."):
-        return "ext-" + n.replace("-", ".")
-    return n.replace(".", "-")[5:]
+    return n.replace(".", "-")
 
 
 def undash(n: str) -> str:
     """
-    foo-bar > moat.foo.bar
-    ext-foo-bar > foo.bar
+    moat-foo-bar > moat.foo.bar
+    foo-bar > foo.bar
     """
-    if "." in n:
-        return n
-
-    if n in ("main", "moat"):
-        return "moat"
-    if n.startswith("ext-"):
-        return n.replace("-", ".")[4:]
-    return "moat." + n.replace("-", ".")
+    return n.replace("-", ".")
 
 
 class ChangedError(RuntimeError):
@@ -153,11 +140,7 @@ class Package(_Common):
 
     @property
     def mdash(self):
-        d = dash(self.name)
-        if d.startswith("ext-"):
-            return d[4:]
-        else:
-            return "moat-" + d
+        return dash(self.name)
 
     def populate(self, path: Path, real=None):
         """
@@ -180,7 +163,7 @@ class Package(_Common):
             raise ValueError(f"No files in {self.name}?")
         p = Path("packaging") / self.dash / "src"
         with suppress(FileNotFoundError):
-            rmtree(p / "moat")
+            rmtree(p)
         dest = p / self.path
         dest.mkdir(parents=True)
         for f in self.files:
@@ -206,7 +189,7 @@ class Package(_Common):
             lc = self.last_commit
         except AttributeError:
             return True
-        for d in head.diff(self.last_commit):
+        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
@@ -222,7 +205,11 @@ class Repo(git.Repo, _Common):
     moat_tag = None
     _last_tag = None
 
-    def __init__(self, *a, **k):
+    toplevel:str
+
+    def __init__(self, toplevel:str, *a, **k):
+        self.toplevel = toplevel
+
         super().__init__(*a, **k)
         self._commit_tags = defaultdict(list)
         self._commit_topo = {}
@@ -238,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:
@@ -299,37 +291,34 @@ class Repo(git.Repo, _Common):
     def _make_repos(self) -> dict:
         """Collect subrepos"""
         for fn in Path("packaging").iterdir():
-            if fn.name == "main":
-                continue
             if not fn.is_dir() or "." in fn.name:
                 continue
             self._add_repo(str(fn.name))
 
-        self._repos["main"].populate(Path("moat"))
+        self._repos[self.toplevel].populate(Path(self.toplevel))
 
     def repo_for(self, path: Path | str, main: bool | None) -> str:
         """
         Given a file path, returns the subrepo in question
         """
-        sc = self._repos["main"]
+        sc = self._repos["moat"]
         path = Path(path)
 
-        if main is not False and path.parts[0] == "moat":
-            name = "moat"
-            for p in path.parts[1:]:
-                if p in sc.subs:
-                    name += "." + p
-                    sc = sc.subs[p]
-                else:
-                    break
-            return name
-
         if main is not True and path.parts[0] == "packaging":
             try:
                 return undash(path.parts[1])
             except IndexError:
                 return None
 
+        name = path.parts[0]
+        if main is not False and name == self.toplevel:
+            for p in path.parts[1:]:
+                if p not in sc.subs:
+                    break
+                name += "." + p
+                sc = sc.subs[p]
+            return name
+
         return None
 
     def commits(self, ref=None):
@@ -361,8 +350,9 @@ class Repo(git.Repo, _Common):
         if tag is None:
             tag = self.last_tag
         head = self._repo.head.commit
+        print("StartDiff B",self,tag,head,file=sys.stderr)
         for d in head.diff(tag):
-            if self.repo_for(d.a_path, main) == "moat" and self.repo_for(d.b_path, main) == "moat":
+            if self.repo_for(d.a_path, main) == self.toplevel and self.repo_for(d.b_path, main) == self.toplevel:
                 continue
             return True
         return False
@@ -521,21 +511,6 @@ def default_dict(a, b, c, cls=dict, repl=lambda x: x) -> dict:
     return mod
 
 
-def is_clean(repo: Repo, skip: bool = True) -> bool:
-    """Check if this repository is clean."""
-    skips = " Skipping." if skip else ""
-    if repo.head.is_detached:
-        print(f"{repo.working_dir}: detached.{skips}")
-        return False
-    if repo.head.ref.name not in {"main", "moat"}:
-        print(f"{repo.working_dir}: on branch {repo.head.ref.name}.{skips}")
-        return False
-    elif repo.is_dirty(index=True, working_tree=True, untracked_files=True, submodules=False):
-        print(f"{repo.working_dir}: Dirty.{skips}")
-        return False
-    return True
-
-
 def _mangle(proj, path, mangler):
     try:
         for k in path[:-1]:
@@ -582,11 +557,13 @@ def apply_hooks(repo, force=False):
 
 @cli.command
 @click.argument("part", type=str)
-def setup(part):
+@click.pass_obj
+def setup(obj, part):
     """
     Create a new MoaT subcommand.
     """
-    repo = Repo(None)
+    cfg = obj.cfg
+    repo = Repo(cfg.src.toplevel, None)
     if "-" in part:
         part = undash(part)
 
@@ -714,11 +691,12 @@ def path_():
 
 
 @cli.command()
-def tags():
+@click.pass_obj
+def tags(obj):
     """
     List all tags
     """
-    repo = Repo(None)
+    repo = Repo(obj.cfg.src.toplevel, None)
 
     for r in repo.parts:
         try:
@@ -742,7 +720,8 @@ def tags():
 @click.option("-q", "--query", "--show", "show", is_flag=True, help="Show the latest tag")
 @click.option("-f", "--force", "FORCE", is_flag=True, help="replace an existing tag")
 @click.option("-b", "--build", is_flag=True, help="set/increment the build number")
-def tag(run, minor, major, subtree, force, FORCE, show, build):
+@click.pass_obj
+def tag(obj, run, minor, major, subtree, force, FORCE, show, build):
     """
     Tag the repository (or a subtree).
 
@@ -763,7 +742,7 @@ def tag(run, minor, major, subtree, force, FORCE, show, build):
     if build and not subtree:
         raise click.UsageError("The main release number doesn't have a build")
 
-    repo = Repo(None)
+    repo = Repo(obj.cfg.src.toplevel, None)
 
     if subtree:
         r = repo.part(subtree)
@@ -771,11 +750,11 @@ def tag(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:
@@ -797,10 +776,11 @@ def tag(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")
 
@@ -877,7 +857,7 @@ async def build(
         g_done = Path(g_done)
     else:
         g_done = Path("/tmp/nonexistent")
-    repo = Repo(None)
+    repo = Repo(cfg.src.toplevel, None)
 
     tags = dict(version)
     skip = set()
@@ -915,10 +895,6 @@ async def build(
             continue
         name = name.stem
         name, vers, _ = name.split("_")
-        if name.startswith("moat-"):
-            name = name[5:]
-        else:
-            name = "ext-" + name
         debversion[name] = vers.rsplit("-", 1)[0]
 
     # Step 0: basic check
@@ -933,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()
@@ -980,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)
@@ -1097,17 +1075,14 @@ async def build(
                 continue
             tag = r.last_tag
             name = r.dash
-            if name.startswith("ext-"):
-                name = name[4:]
-            else:
-                name = "moat-" + r.dash
 
             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)
@@ -1136,10 +1111,6 @@ async def build(
                     continue
                 tag = r.last_tag
                 name = r.dash
-                if name.startswith("ext-"):
-                    name = name[4:]
-                else:
-                    name = "moat-" + r.dash
                 targz = Path("dist") / f"{r.under}-{tag}.tar.gz"
                 whl = Path("dist") / f"{r.under}-{tag}-py3-none-any.whl"
                 try:
@@ -1191,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.8.11 → moat_src-0.9.1/src/moat_src.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.8.11
+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.8.11/src/moat/src/_cfg.yaml

@@ -1,2 +0,0 @@
-src:
-  done: "/src/DONE"