moat-src 0.9.5__py3-none-any.whl → 0.9.7__py3-none-any.whl

moat/src/_main.py

@@ -10,6 +10,7 @@ from collections import defaultdict, deque
 from configparser import RawConfigParser
 from pathlib import Path
 from copy import deepcopy
+from packaging.version import Version
 
 import asyncclick as click
 import git
@@ -232,6 +233,7 @@ class Repo(git.Repo, _Common):
 
     def write_tags(self):
         if self.versions == self.orig_versions:
+            logger.warning("No changed versions. Not tagging.")
             return False
         with open("versions.yaml", "w") as f:
             yprint(self.versions, f)
@@ -246,15 +248,21 @@ class Repo(git.Repo, _Common):
         if self._last_tag is not None:
             return self._last_tag
 
-        for c in self._repo.commits(self.head.commit):
-            t = self.tagged(c)
-            if t is None:
-                continue
-
-            self._last_tag = t
-            return t
+        tag = None
+        vers = None
+        for tt in self._commit_tags.values():
+            for t in tt:
+                if "/" in t.name:
+                    continue
+                tv = Version(t.name)
+                if tag is None or vers < tv:
+                    tag = t
+                    vers = tv
 
-        raise ValueError("No tags found")
+        if tag is None:
+            raise ValueError("No tags found")
+        self._last_tag = tag.name
+        return tag.name
 
     @property
     def last_commit(self) -> str:

moat/src/test.py

@@ -59,7 +59,7 @@ async def run(*args, expect_exit=0, do_stdout=True):
         if do_stdout:
             if res is not None:
                 res.stdout = out.getvalue()
-            CFG["_stdout"] = sys.stdout
+        CFG.pop("_stdout", None)
 
 
 class DidNotRaise(Exception):

{moat_src-0.9.5.dist-info → moat_src-0.9.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moat-src
-Version: 0.9.5
+Version: 0.9.7
 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.5.dist-info → moat_src-0.9.7.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=H7bFpjHPHYjIoC8IYo2eFH33lH6kBlLgSX52oJGy7J4,35528
+moat/src/_main.py,sha256=1Vy58Lj4Lploc6tBDzdpZ2zwXGIu428k7yRAbr5dIbY,35839
 moat/src/inspect.py,sha256=rUU-FQyQoQP8LJCebbtdL6lgzz9KPH7KGSq11kD4nmU,1489
-moat/src/test.py,sha256=R03YQqWLmgcW8KZQwrmjAsL5SyK4N1gjBlrOtfp6P5c,2159
+moat/src/test.py,sha256=UmBQ0trssY1rLNLXwJp8gdcX6__GJBUqmcryV_0PfcA,2152
 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.5.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
-moat_src-0.9.5.dist-info/METADATA,sha256=TfaQ1xsyNhFimo619lIsqpCCUr6gTF74gnug-LUi05M,733
-moat_src-0.9.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-moat_src-0.9.5.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
-moat_src-0.9.5.dist-info/RECORD,,
+moat_src-0.9.7.dist-info/licenses/LICENSE.txt,sha256=L5vKJLVOg5t0CEEPpW9-O_0vzbP0PEjEF06tLvnIDuk,541
+moat_src-0.9.7.dist-info/METADATA,sha256=EyZgHa8swC2yF23EkMmuHhCI57vqRYA0GqQxi2rjh78,733
+moat_src-0.9.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+moat_src-0.9.7.dist-info/top_level.txt,sha256=pcs9fl5w5AB5GVi4SvBqIVmFrkRwQkVw_dEvW0Q0cSA,5
+moat_src-0.9.7.dist-info/RECORD,,