moat-src 0.5.2__py3-none-any.whl → 0.6.1__py3-none-any.whl

moat/src/_hooks/pre-commit

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+## pre-commit hook to catch editing in "deb" branch without modifying the changelog
+B="$(git rev-parse --abbrev-ref HEAD)"
+if test "$B" = "deb" || test "$B" = "debian" ; then
+    S="$(git status -s -- debian/changelog | head -c2 | sed -e 's/ //g')"
+    if test "$S" != "A" && test "$S" != "M" ; then
+        echo "You can't commit to Debian without a changelog entry."
+        exit 1
+    fi
+fi

moat/src/_main.py

@@ -49,8 +49,12 @@ class Repo(git.Repo):
                 try:
                     res = self._subrepo_cache[r.path]
                 except KeyError:
-                    p = Path(self.working_dir) / r.path
-                    self._subrepo_cache[r.path] = res = Repo(p)
+                    try:
+                        p = Path(self.working_dir) / r.path
+                        self._subrepo_cache[r.path] = res = Repo(p)
+                    except git.exc.InvalidGitRepositoryError:
+                        logger.info("%s: invalid, skipping.", p)
+                        continue
                     res.submod = r
                 if recurse:
                     yield from res.subrepos(depth=depth)
@@ -265,6 +269,28 @@ def encomma(proj, path):
     """list > comma-delimited string"""
     _mangle(proj, path, lambda x: ",".join(x))  # pylint: disable=unnecessary-lambda
 
+def apply_hooks(repo, force=False):
+    h = Path(repo.git_dir)/"hooks"
+    drop = set()
+    seen = set()
+    for f in h.iterdir():
+        if f.suffix == ".sample":
+            drop.add(f)
+            continue
+        seen.add(f.name)
+    for f in drop:
+        f.unlink()
+
+    pt = (Path(__file__).parent / "_hooks")
+    for f in pt.iterdir():
+        if not force:
+            if f.name in seen:
+                continue
+        t = h/f.name
+        d = f.read_text()
+        t.write_text(d)
+        t.chmod(0o755)
+
 
 def apply_templates(repo):
     """
@@ -429,6 +455,8 @@ By default, changes amend the HEAD commit if the text didn't change.
 @click.option("-D", "--no-dirty", is_flag=True, help="don't check for dirtiness (DANGER)")
 @click.option("-C", "--no-commit", is_flag=True, help="don't commit")
 @click.option("-s", "--skip", type=str, multiple=True, help="skip this repo")
+@click.option("--hooks", is_flag=True, help="only update hooks")
+@click.option("--HOOKS", "fhooks", is_flag=True, help="force-update hooks")
 @click.option(
     "-m",
     "--message",
@@ -437,7 +465,7 @@ By default, changes amend the HEAD commit if the text didn't change.
     default="Update from MoaT template",
 )
 @click.option("-o", "--only", type=str, multiple=True, help="affect only this repo")
-async def setup(no_dirty, no_commit, skip, only, message, amend, no_amend):
+async def setup(no_dirty, no_commit, skip, only, message, amend, no_amend, hooks, fhooks):
     """
     Set up projects using templates.
 
@@ -451,6 +479,11 @@ async def setup(no_dirty, no_commit, skip, only, message, amend, no_amend):
         repos = (x for x in repo.subrepos(depth=True) if x.moat_name[5:] not in skip)
 
     for r in repos:
+        apply_hooks(r, fhooks)
+        if hooks or fhooks:
+            print(r.working_dir)
+            continue
+
         if not is_clean(r, not no_dirty):
             if not no_dirty:
                 continue
@@ -459,7 +492,7 @@ async def setup(no_dirty, no_commit, skip, only, message, amend, no_amend):
         if proj.is_file():
             apply_templates(r)
         else:
-            logger.info("%s: no pyproject.toml file. Skipping.")
+            logger.info("%s: no pyproject.toml file. Skipping.", r.working_dir)
             continue
 
         if no_commit:
@@ -797,5 +830,5 @@ async def build(version, no_test, no_commit, no_dirty, cache):
 add_repr(tomlkit.items.String)
 add_repr(tomlkit.items.Integer)
 add_repr(tomlkit.items.Bool, bool)
-add_repr(tomlkit.items.MutableMapping)
-add_repr(tomlkit.items.MutableSequence)
+add_repr(tomlkit.items.AbstractTable)
+add_repr(tomlkit.items.Array)

moat/src/_templates/make/py

@@ -1,7 +1,7 @@
 # Makefile snippet for some standard Python stuff
 
 PACKAGE ?= $(notdir $(shell pwd))
-PYPI ?= $(PACKAGE)
+PYPI ?= $(subst -,_,${PACKAGE})
 
 PATH := /usr/share/sphinx/scripts/python3:${PATH}
 export PYTHONPATH := $(PYTHONPATH)$(if $(PYTHONPATH),:)$(shell pwd)
@@ -97,7 +97,7 @@ pypi:	tagged
 	fi
 	twine upload \
 		dist/${PYPI}-$(shell git describe --tags --exact-match).tar.gz \
-		dist/$(subst -,_,${PYPI})-$(shell git describe --tags --exact-match)-py3-none-any.whl
+		dist/${PYPI}-$(shell git describe --tags --exact-match)-py3-none-any.whl
 
 upload: pypi
 	git push --tags

moat/src/_templates/pyproject.default.yaml

@@ -31,71 +31,72 @@ tool:
     ini_options:
       log_cli_level: DEBUG
   ruff:
-    select:
-    - ALL
-    ignore:
-    - ANN
-    - PTH
-    - PERF
-    - D105
-    - D107
-    - A003
-    - S101
-    - RUF001
-    - RUF002
-    - PLW1514
-    - D2
-    - D3
-    - D4
-    - T2
-    - FBT
-    - TRY003
-    - EM10
-    - PLR
-    - C
-    - RET50
-    - TD
-    - FIX
-    - N
-    - ERA
-    - BLE001
+    lint:
+      select:
+      - ALL
+      ignore:
+      - ANN
+      - PTH
+      - PERF
+      - D105
+      - D107
+      - A003
+      - S101
+      - RUF001
+      - RUF002
+      - PLW1514
+      - D2
+      - D3
+      - D4
+      - T2
+      - FBT
+      - TRY003
+      - EM10
+      - PLR
+      - C
+      - RET50
+      - TD
+      - FIX
+      - N
+      - ERA
+      - BLE001
+      explicit-preview-rules: true
+      flake8-comprehensions:
+        allow-dict-calls-with-keyword-arguments: true
+      flake8-builtins:
+        builtins-ignorelist:
+        - id
+        - help
+      isort:
+        no-lines-before:
+        - future
+        required-imports:
+        - "from __future__ import annotations"
+        section-order:
+        - future
+        - typing
+        - standard-library
+        - first-party
+        - upy
+        - moat
+        - local-folder
+        - third-party
+        extra-standard-library:
+        - pytest
+        - anyio
+        force-to-top:
+        - moat.util
+        sections:
+          moat:
+          - moat
+          upy:
+          - micropython
+          - machine
+          - esp
+          typing:
+          - typing
     preview: true
-    explicit-preview-rules: true
     line-length: 99
-    flake8-comprehensions:
-      allow-dict-calls-with-keyword-arguments: true
-    flake8-builtins:
-      builtins-ignorelist:
-      - id
-      - help
-    isort:
-      no-lines-before:
-      - future
-      required-imports:
-      - "from __future__ import annotations"
-      section-order:
-      - future
-      - typing
-      - standard-library
-      - first-party
-      - upy
-      - moat
-      - local-folder
-      - third-party
-      extra-standard-library:
-      - pytest
-      - anyio
-      force-to-top:
-      - moat.util
-      sections:
-        moat:
-        - moat
-        upy:
-        - micropython
-        - machine
-        - esp
-        typing:
-        - typing
   black:
     line-length: 99
   flake8:

moat/src/test.py

@@ -53,10 +53,9 @@ async def run(*args, expect_exit=0, do_stdout=True):
         assert expect_exit == 0
         return res
     finally:
-        if res is None:
-            res = attrdict()
         if do_stdout:
-            res.stdout = out.getvalue()
+            if res is not None:
+                res.stdout = out.getvalue()
             CFG["_stdout"] = sys.stdout
 
 

{moat_src-0.5.2.dist-info → moat_src-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moat-src
-Version: 0.5.2
+Version: 0.6.1
 Summary: Tools for managing the MoaT sources
 Author-email: Matthias Urlichs <matthias@urlichs.de>
 Project-URL: homepage, https://m-o-a-t.org
@@ -15,9 +15,9 @@ Classifier: License :: OSI Approved
 Classifier: Development Status :: 4 - Beta
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
-Requires-Dist: anyio (~=3.0)
+Requires-Dist: anyio~=3.0
 Requires-Dist: asyncclick
 Requires-Dist: gitpython
 Requires-Dist: packaging
-Requires-Dist: tomlkit (~=0.11)
+Requires-Dist: tomlkit~=0.12
 

{moat_src-0.5.2.dist-info → moat_src-0.6.1.dist-info}/RECORD

@@ -1,16 +1,17 @@
 moat/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moat/src/_main.py,sha256=F_lZOP0pTSD_iPb01LHfeyqaobPjpYkWxSKtJo_rqVI,24501
+moat/src/_main.py,sha256=mIWguSJeHJtS46ndtWZCvHXIK34rXFZKTeRj35QdmnY,25486
 moat/src/inspect.py,sha256=Rb5x7Qgyb7W1UpGRTPMHB-XLy6J9yZ4Iw4sOhATrOHA,1452
-moat/src/test.py,sha256=VB0ZG5svsIJHGtANRYg9KIK4NQHDfkm25t7dJWgfTGc,2166
+moat/src/test.py,sha256=7jOUUwgrbtPS3clwiUgf6sIS7Kb1Yv3XcpZc-hajBP0,2149
+moat/src/_hooks/pre-commit,sha256=_2IeAh-Gq5YjHtA08TBYAMbrDslNSRue59a1Y6mykns,412
 moat/src/_templates/LICENSE.txt,sha256=X6cpfPmXmOftxOF5o9xedKUWPzU69OiCRrOW1CmRBjs,528
 moat/src/_templates/Makefile,sha256=fdTxSrMJbQO02XTRatmM-QA6iibYw_il4UrNff0Nkss,268
 moat/src/_templates/gitignore,sha256=F1dVTKg7mLHLp--Z-KBwU-HyyPOGm-uN0qfS_yK8vz0,436
-moat/src/_templates/pyproject.default.yaml,sha256=0ImapzFaJhs-dJXngnGpk--hPDeUAsDk_EXALWJBjvE,2665
+moat/src/_templates/pyproject.default.yaml,sha256=nHUa7dQhe8QpDH9Gbmjflf3BI3ECk2cuXArf0oPCgeg,2801
 moat/src/_templates/pyproject.forced.yaml,sha256=djfcy3hgfoIgrn2pRrxDWTyN3EEsA1y5NhkzYrGjgNY,1427
 moat/src/_templates/test_basic_py,sha256=Lr5dq8C04DiRabA0rCURsZdcc2mVAUGPzjLU6iR8LTE,174
-moat/src/_templates/make/py,sha256=UbEujNqUNcMTzPfO4nKkJtu6JfvyBnQBe6S-m-GFf3E,2722
+moat/src/_templates/make/py,sha256=on54GbUWeOBkUmCKGWBAIuEJUGgUE6HM3Ty6KXmRpGs,2722
 moat/src/_templates/moat/__init__.py,sha256=DDN1IA3oN2R1OTIhJCNOOSCpfbqXIByh2WUNYDFcuzw,105
-moat_src-0.5.2.dist-info/METADATA,sha256=mNaA_yIMlZmaUlCdbDqQoQGfTUbFjdNbVQyI7KKJjZo,732
-moat_src-0.5.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-moat_src-0.5.2.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_src-0.5.2.dist-info/RECORD,,
+moat_src-0.6.1.dist-info/METADATA,sha256=fj5qvfPsgVhT5Oqpk4C0nyyyP4-N7ZD2ylueOSfXblE,726
+moat_src-0.6.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+moat_src-0.6.1.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_src-0.6.1.dist-info/RECORD,,

{moat_src-0.5.2.dist-info → moat_src-0.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any