omdev 0.0.0.dev237__py3-none-any.whl → 0.0.0.dev238__py3-none-any.whl

omdev/.manifests.json

@@ -291,7 +291,7 @@
     "module": ".tools.git.messages",
     "attr": "_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST",
     "file": "omdev/tools/git/messages.py",
-    "line": 77,
+    "line": 85,
     "value": {
       "$.tools.git.messages.GitMessageGeneratorManifest": {
         "mod_name": "omdev.tools.git.messages",
@@ -435,7 +435,7 @@
     "module": ".tools.shadow",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shadow.py",
-    "line": 63,
+    "line": 64,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "shadow",

omdev/manifests/build.py

@@ -3,6 +3,7 @@
 TODO:
  - verify classes instantiate
  - embed in pyproject
+ - roundtrip flexibility regarding json-ness - tuples vs lists vs sets vs frozensets etc
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -43,7 +44,13 @@ T = ta.TypeVar('T')
 
 MANIFEST_MAGIC_KEY = '@omlish-manifest'
 
-_MANIFEST_GLOBAL_PAT = re.compile(r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*=.*')
+_MANIFEST_GLOBAL_PATS = tuple(re.compile(p) for p in [
+    # _FOO_MANIFEST = FooManifest(...
+    r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*=.*',
+
+    # class _FOO_MANIFEST(StaticFooManifest): ...
+    r'^class (?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*(\(|$)',
+])
 
 
 def _dump_module_manifests(spec: str, *attrs: str) -> None:
@@ -59,13 +66,17 @@ def _dump_module_manifests(spec: str, *attrs: str) -> None:
         manifest = getattr(mod, attr)
 
         if dc.is_dataclass(manifest):
+            # Support static dataclasses
+            if isinstance(manifest, type):
+                manifest = manifest()
+
             cls = type(manifest)
-            manifest_json = json.dumps(dc.asdict(manifest))  # type: ignore
+            manifest_json = json.dumps(dc.asdict(manifest))
             manifest_dct = json.loads(manifest_json)
 
-            rt_manifest = cls(**manifest_dct)  # type: ignore
+            rt_manifest = cls(**manifest_dct)
             if rt_manifest != manifest:
-                raise Exception(f'Manifest failed to roundtrip: {manifest} -> {manifest_dct} != {rt_manifest}')
+                raise Exception(f'Manifest failed to roundtrip: {manifest} => {manifest_dct} != {rt_manifest}')
 
             key = f'${cls.__module__}.{cls.__qualname__}'
             out[attr] = {key: manifest_dct}
@@ -146,7 +157,11 @@ class ManifestBuilder:
         lines = src.splitlines(keepends=True)
         for i, l in enumerate(lines):
             if l.startswith('# ' + MANIFEST_MAGIC_KEY):
-                if (m := _MANIFEST_GLOBAL_PAT.match(nl := lines[i + 1])) is None:
+                nl = lines[i + 1]
+                for pat in _MANIFEST_GLOBAL_PATS:
+                    if (m := pat.match(nl)) is not None:
+                        break
+                else:
                     raise Exception(nl)
 
                 origins.append(ManifestOrigin(

omdev/pip.py

@@ -1,23 +1,16 @@
 import importlib.metadata
-import io
+import json
 import sys
 import typing as ta
 import urllib.request
 
 from omlish import check
-from omlish import lang
 
 from .packaging.names import canonicalize_name
 from .packaging.requires import RequiresVariable
 from .packaging.requires import parse_requirement
 
 
-if ta.TYPE_CHECKING:
-    import xml.etree.ElementTree as ET  # noqa
-else:
-    ET = lang.proxy_import('xml.etree.ElementTree')
-
-
 ##
 
 
@@ -30,11 +23,11 @@ def lookup_latest_package_version(
         pypi_url: str = DEFAULT_PYPI_URL,
 ) -> str:
     pkg_name = check.non_empty_str(package)
-    with urllib.request.urlopen(f'{pypi_url.rstrip("/")}/rss/project/{pkg_name}/releases.xml') as resp:  # noqa
-        rss = resp.read()
-    doc = ET.parse(io.BytesIO(rss))  # noqa
-    latest = check.not_none(doc.find('./channel/item/title')).text
-    return check.non_empty_str(latest)
+    with urllib.request.urlopen(f'{pypi_url.rstrip("/")}/pypi/{pkg_name}/json') as resp:  # noqa
+        buf = resp.read()
+    # https://github.com/python/cpython/blob/51d4bf1e0e5349090da72721c865b6c2b28277f3/Tools/scripts/checkpip.py
+    dct = json.loads(buf.decode('utf-8'))
+    return check.non_empty_str(dct['info']['version'])
 
 
 ##

omdev/tools/git/messages.py

@@ -1,14 +1,15 @@
 import abc
-import dataclasses as dc
 import os
 import typing as ta
 
 from omlish import cached
 from omlish import check
+from omlish import dataclasses as dc
 from omlish import lang
 from omlish.manifests import load as manifest_load
 from omlish.manifests.base import ModAttrManifest
 from omlish.manifests.base import NameAliasesManifest
+from omlish.manifests.static import StaticModAttrManifest
 
 from . import consts
 
@@ -44,6 +45,13 @@ class GitMessageGeneratorManifest(NameAliasesManifest, ModAttrManifest):
         return check.issubclass(self.load(), GitMessageGenerator)
 
 
+class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGeneratorManifest, abc.ABC):
+    pass
+
+
+#
+
+
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
     ldr = manifest_load.MANIFEST_LOADER
@@ -75,9 +83,7 @@ class TimestampGitMessageGenerator(GitMessageGenerator):
 
 
 # @omlish-manifest
-_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST = GitMessageGeneratorManifest(
-    mod_name=__name__,
-    attr_name='TimestampGitMessageGenerator',
-    name='timestamp',
-    aliases=['ts'],
-)
+class _TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST(StaticGitMessageGeneratorManifest):  # noqa
+    attr_name = 'TimestampGitMessageGenerator'
+    name = 'timestamp'
+    aliases = ['ts']  # noqa

omdev/tools/shadow.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - 'edit', default cwd - use git's
+  - git var GIT_EDITOR
  - delete?
  - 'purge'?
  - 'validate' - at least formats

{omdev-0.0.0.dev237.dist-info → omdev-0.0.0.dev238.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev237
+Version: 0.0.0.dev238
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev237
+Requires-Dist: omlish==0.0.0.dev238
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev237.dist-info → omdev-0.0.0.dev238.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=LmJlGLGHC1icR876hQcV2MUvKNnAglRKeIO6uBV2Wx0,9798
+omdev/.manifests.json,sha256=NP2sLr8MwlA0AKzDiFihSzLlqzYFENtN4MsjwQLPit4,9798
 omdev/__about__.py,sha256=Iect_SBD2EXgx7QcFGiOqTHkOWD-bWOyvzgReDOY4Es,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -6,7 +6,7 @@ omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=oBAp1K8h-iCDd9uCn-OpNpZ6n36oYFkWLIiTyQw4irU,4573
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
 omdev/imgur.py,sha256=Uyz8nkORlhfXXK5Sty16tX8ro8s-b7LrxjOECv4_sB0,3005
-omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
+omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
@@ -155,7 +155,7 @@ omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
 omdev/magic/styles.py,sha256=YQ-HgwfvFWPj-o_705E7A-yehEn1G1hRNLPWpeWCK0U,605
 omdev/manifests/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
-omdev/manifests/build.py,sha256=yX0QM6c60aauiF-8oDxrXhkrhhwHcRw_qft_IIW6LD8,8767
+omdev/manifests/build.py,sha256=KDDB1pAWeR8NPLr43SScfrQvleI48SYuTKeYOrbNM9I,9232
 omdev/manifests/main.py,sha256=7zRlyE0BDPqITEbChlTBRGulAvG1nUZPHXrerNExriE,2126
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
@@ -233,13 +233,13 @@ omdev/tools/notebook.py,sha256=q1YMGwM1skHv-dPbtT_cM7UOGFNiMEAxjr6rr6rbobk,3494
 omdev/tools/pip.py,sha256=eBD41hp-V3thGfhUBM3Erxl4CSG-5LG6Szo1sA76P2k,3459
 omdev/tools/prof.py,sha256=hQakAsViJD4gLJpLLZnTkOqmTDAwM48Nx5q-O_aFlYM,1467
 omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
-omdev/tools/shadow.py,sha256=a22OMBqVa35UAdhjp54FtEaNcn5OAhgNLY4Yn-tcelk,1578
+omdev/tools/shadow.py,sha256=lkjnlv82rJImMrQgRdxBbxNo-CeJZGXdwi6YUnyJjiQ,1601
 omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
 omdev/tools/git/cli.py,sha256=g1ViLqisliuQbacZg3Vr3MaMd4Acxlv79L8pqv8aMTI,11768
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
-omdev/tools/git/messages.py,sha256=jrZuKtE8Nbb-E_FqkiOuUEHypix-rzJqmTln5iPcYMk,2232
+omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
@@ -251,9 +251,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev237.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev237.dist-info/METADATA,sha256=WskhQEERuCpPSMzmgF-CsyuZZtG4T3_IucEwfalGb_E,1636
-omdev-0.0.0.dev237.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev237.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev237.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev237.dist-info/RECORD,,
+omdev-0.0.0.dev238.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev238.dist-info/METADATA,sha256=T1Z_cz17NghFGv-YnOzJyS7g54np8JAFspfwEggIHKI,1636
+omdev-0.0.0.dev238.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev238.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev238.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev238.dist-info/RECORD,,