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

moat/src/_cfg.yaml

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

moat/src/_main.py

@@ -27,32 +27,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 +139,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 +162,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 +188,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=Path("packaging")/self.dash if main else self.path):
             if (
                 self._repo.repo_for(d.a_path, main) != self.name
                 and self._repo.repo_for(d.b_path, main) != self.name
@@ -222,7 +204,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 = {}
@@ -299,37 +285,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 +344,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 +505,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 +551,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 +685,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 +714,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 +736,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)
@@ -877,7 +850,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 +888,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
@@ -1082,7 +1051,9 @@ async def build(
                     print("*** Failure packaging", r.name, file=sys.stderr)
                 else:
                     print("Failure packaging", r.name, file=sys.stderr)
-                    return
+                    no_commit=True
+                    no_deb=True
+                    no_pypi=True
 
     # Step 5: build PyPI package
     if not no_pypi:
@@ -1095,10 +1066,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 = rd / "dist" / f"{r.under}-{tag}.tar.gz"
             done = rd / "dist" / f"{r.under}-{tag}.done"
@@ -1121,10 +1088,11 @@ async def build(
                 print("Build errors:", file=sys.stderr)
                 print(*err, file=sys.stderr)
                 print("Please fix and try again.", file=sys.stderr)
-                return
+                no_commit=True
+                no_deb=True
 
         # Step 6: upload PyPI package
-        if run:
+        elif run:
             err = set()
             for r in up:
                 rd = PACK / r.dash
@@ -1133,10 +1101,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:
@@ -1154,7 +1118,8 @@ async def build(
                 print("Upload errors:", file=sys.stderr)
                 print(*err, file=sys.stderr)
                 print("Please fix(?) and try again.", file=sys.stderr)
-                return
+                no_commit=True
+                no_deb=True
 
     # Step 7: upload Debian package
     if run and not no_deb:
@@ -1183,7 +1148,7 @@ async def build(
             print("Upload errors:", file=sys.stderr)
             print(*err, file=sys.stderr)
             print("Please fix(?) and try again.", file=sys.stderr)
-            return
+            no_commit=True
 
     # Step 8: commit the result
     if run:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.8.10
+Version: 0.9.0
 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.10.dist-info → moat_src-0.9.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 moat/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moat/src/_cfg.yaml,sha256=FLoCF_uvic-_i6dVjGyCorT9Rfqi3SXqWlgNyVtrT3w,25
-moat/src/_main.py,sha256=kVX-bd6mh8tGsRtj8f0AmGtAwvUXi_rsIKJh9cfjMrc,35915
+moat/src/_cfg.yaml,sha256=bXRcamFBn1VCc7MhGBiWK5ciq4qw6iXyZzRJWvs_m0Q,35
+moat/src/_main.py,sha256=sWI450D4sZzPXs3vXE_444kx8_4vKThSJru6a1qu_kY,34903
 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.8.10.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_src-0.8.10.dist-info/METADATA,sha256=bUFCo4n4JgTZeXgtfrqGkCGooNY7Owj2GY5dDri_u7U,734
-moat_src-0.8.10.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-moat_src-0.8.10.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_src-0.8.10.dist-info/RECORD,,
+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,,