omdev 0.0.0.dev237__tar.gz → 0.0.0.dev238__tar.gz

{omdev-0.0.0.dev237/omdev.egg-info → omdev-0.0.0.dev238}/PKG-INFO

@@ -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 → omdev-0.0.0.dev238}/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-0.0.0.dev237 → omdev-0.0.0.dev238}/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-0.0.0.dev237 → omdev-0.0.0.dev238}/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-0.0.0.dev237 → omdev-0.0.0.dev238}/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-0.0.0.dev237 → omdev-0.0.0.dev238}/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 → omdev-0.0.0.dev238/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev238}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev237
+omlish==0.0.0.dev238
 
 [all]
 black~=25.1

{omdev-0.0.0.dev237 → omdev-0.0.0.dev238}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev237'
+version = '0.0.0.dev238'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev237',
+    'omlish == 0.0.0.dev238',
 ]
 
 [project.optional-dependencies]