omdev 0.0.0.dev528__tar.gz → 0.0.0.dev529__tar.gz

{omdev-0.0.0.dev528/omdev.egg-info → omdev-0.0.0.dev529}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev528
+Version: 0.0.0.dev529
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev528
+Requires-Dist: omlish==0.0.0.dev529
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -333,15 +333,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/dockerdev/gen.py

@@ -1,7 +1,4 @@
 """
-FIXME:
- - zipsafe / resourcey, but still hard refs .versions file in repo root lol
-
 TODO:
  - per-feature config, obv
 
@@ -134,9 +131,11 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         ops.append(fragment_section(
             'pyenv',
             static_env=lambda: {
-                'PYENV_VERSIONS': list(read_versions_file_versions(*[
-                    f'PYTHON_{k}' for k in cfg.pyenv_version_keys
-                ]).values()),
+                'PYENV_VERSIONS': list(read_versions_file_versions(
+                    'resources',
+                    '.python-versions.json',
+                    cfg.pyenv_version_keys,
+                ).values()),
             },
             cache_mounts=['/root/.pyenv_cache'],
         ))

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/dockerdev/helpers.py

@@ -1,7 +1,11 @@
 import io
+import json
 import tomllib
 import typing as ta
 
+from omlish import check
+from omlish import lang
+
 from .content import Content
 from .content import Resource
 from .content import StaticEnv
@@ -63,21 +67,13 @@ def render_apt_install_dep_sets(*names: str) -> str:
 ##
 
 
-def read_versions_file(file_path: str | None = None) -> ta.Mapping[str, str]:
-    if file_path is None:
-        file_path = '.versions'
-    with open(file_path) as f:
-        s = f.read()
-
-    return {
-        k.strip(): v.strip()
-        for l in s.splitlines()
-        for l in [l.split('#')[0].strip()]
-        if '=' in l
-        for k, _, v in [l.partition('=')]
-    }
-
-
-def read_versions_file_versions(*keys: str, file_path: str | None = None) -> ta.Mapping[str, str]:
-    dct = read_versions_file(file_path)
+def read_versions_file_versions(
+        resource_path: str,
+        resource_name: str,
+        keys: ta.Sequence[str],
+) -> ta.Mapping[str, str]:
+    check.not_isinstance(keys, str)
+    rs = lang.get_relative_resources(resource_path, globals=globals())
+    src = rs[resource_name].read_text()
+    dct = json.loads(src)
     return {k: dct[k] for k in keys}

omdev-0.0.0.dev529/omdev/dockerdev/resources/.pkgdata

@@ -0,0 +1,2 @@
+*
+.*

omdev-0.0.0.dev529/omdev/dockerdev/resources/.python-versions.json

@@ -0,0 +1,15 @@
+{
+  "8": "3.8.20",
+  "9": "3.9.25",
+  "10": "3.10.19",
+  "11": "3.11.14",
+  "12": "3.12.12",
+  "13": "3.13.12",
+  "13d": "3.13.12d",
+  "13t": "3.13.12t",
+  "13dt": "3.13.12dt",
+  "14": "3.14.3",
+  "14t": "3.14.3t",
+  "15": "3.15.0a6",
+  "15t": "3.15.0a6t"
+}

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.gdbinit

@@ -0,0 +1,2 @@
+handle SIGUSR1 nostop noprint
+handle SIGUSR2 nostop noprint

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.pkgdata

@@ -0,0 +1,2 @@
+*
+.*

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.tmux.conf

@@ -0,0 +1,7 @@
+setw -g mode-keys vi
+set -g status-keys vi
+set -sg escape-time 0
+set -g status-fg black
+set -g history-limit 50000
+set -g update-environment "DISPLAY"
+set -sg default-terminal "xterm-256color"

omdev-0.0.0.dev529/omdev/dockerdev/resources/configs/.vimrc

@@ -0,0 +1,6 @@
+set number
+syntax on
+filetype indent plugin on
+set tabstop=4
+set shiftwidth=4
+set expandtab

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/java/cli.py

@@ -54,6 +54,7 @@ def build_maven_project(
         src_file: str,
         *,
         deps: ta.Sequence[str] | None = None,
+        require_symlink: bool = False,
 ) -> pg.Project:
     with open(src_file) as f:
         src = f.read()
@@ -64,9 +65,13 @@ def build_maven_project(
 
     if (pms := list(filter(None, map(PACKAGE_PAT.fullmatch, src.splitlines())))):
         group_id = pms[0].group(1)
+        can_symlink = True
     else:
+        if require_symlink:
+            raise ValueError(f'Cannot symlink source file, no package specified.')
         group_id = DEFAULT_PROJECT_GROUP_ID
         src = f'package {group_id};\n\n{src}'
+        can_symlink = False
 
     check.non_empty_str(group_id)
     group_id_parts = group_id.split('.')
@@ -109,8 +114,12 @@ def build_maven_project(
         sp_dir = os.path.join(sp_dir, gi_part)
     os.makedirs(sp_dir)
 
-    with open(os.path.join(sp_dir, os.path.basename(src_file)), 'w') as f:
-        f.write(src)
+    sp_src_file = os.path.join(sp_dir, os.path.basename(src_file))
+    if can_symlink:
+        os.symlink(os.path.abspath(src_file), os.path.abspath(sp_src_file))
+    else:
+        with open(sp_src_file, 'w') as f:
+            f.write(src)
 
     with open(os.path.join(root_dir, 'pom.xml'), 'w') as f:
         f.write(pom_xml)

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/manifests/_dumping.py

@@ -39,7 +39,7 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -449,15 +449,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/pyproject/configs.py

@@ -24,7 +24,7 @@ class PyprojectConfig:
     venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
 
     venvs_dir: str = '.venvs'
-    # versions_file: ta.Optional[str] = '.versions'  # FIXME:
+    # versions_file: ta.Optional[str] = '.python-versions.json'  # FIXME:
 
 
 class PyprojectConfigPreparer:

omdev-0.0.0.dev529/omdev/pyproject/versions.py

@@ -0,0 +1,23 @@
+# ruff: noqa: UP045
+import dataclasses as dc
+import json
+import os.path
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class VersionsFile:
+    name: ta.Optional[str] = '.python-versions.json'
+
+    @cached_nullary
+    def pythons(self) -> ta.Mapping[str, str]:
+        if not self.name or not os.path.exists(self.name):
+            return {}
+        with open(self.name) as f:
+            s = f.read()
+        return json.loads(s)

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/ci.py

@@ -100,7 +100,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='73b7f5e5493c7ed12ff0ce36e37b596e5984cb08'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
@@ -1357,15 +1357,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/interp.py

@@ -56,7 +56,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../packaging/versions.py', sha1='71627ad600b3529b829b0e227b0952f2c63c7271'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -948,15 +948,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/lib/inject.py

@@ -32,7 +32,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='inject.py', sha1='6f097e3170019a34ff6834d36fcc9cbeed3a7ab4'),
@@ -333,15 +333,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/lib/io/streams.py

@@ -26,7 +26,7 @@ def __omlish_amalg__():  # noqa
             dict(path='errors.py', sha1='67ca85fd8741b5bfefe76c872ce1c30c18fab06f'),
             dict(path='../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
-            dict(path='types.py', sha1='36dfe0ba2bb0a7fdf255a3a2fcfc7a5fe2cce2c3'),
+            dict(path='types.py', sha1='8a12dc29f6e483dd8df5336c0d9b58a00b64e7ed'),
             dict(path='base.py', sha1='67ae88ffabae21210b5452fe49c9a3e01ca164c5'),
             dict(path='framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
@@ -329,7 +329,7 @@ class ByteStreamBufferLike(Abstract):
           - collectively represent exactly the readable bytes, in order
           - be 1-D, byte-oriented views (itemsize 1)
           - be non-copying views of the underlying storage
-          - be non-empty - lack of data is represented by returning no segments, not a empty segments
+          - be non-empty - lack of data is represented by returning no segments, not empty segments
 
         Callers must assume that the returned views may be invalidated by subsequent mutations of the originating
         buffer/view (e.g., advancing, writing, reserving, committing), depending on the implementation's rules.

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/lib/marshal.py

@@ -41,7 +41,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -334,15 +334,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev/scripts/pyproject.py

@@ -96,7 +96,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='4dee5d317d9e0fab5cd65f31a3cc1a496f7adfff'),
+            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -109,7 +109,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../cexts/magic.py', sha1='4e5ce6732454f75c9dd27352959708d8fa7b1666'),
             dict(path='../magic/find.py', sha1='436228a9cf1d8bab6b9234d09f72913b0960382f'),
             dict(path='../packaging/specifiers.py', sha1='a56ab4e8c9b174adb523921f6280ac41e0fce749'),
-            dict(path='versions.py', sha1='99aa1788f4eccb1901f21f2265862716d7580192'),
+            dict(path='versions.py', sha1='eb6579b9ea2bcee5f71e1af1e430429112f7fc8d'),
             dict(path='../../omlish/argparse/cli.py', sha1='f4dc3cd353d14386b5da0306768700e396afd2b3'),
             dict(path='../../omlish/lite/marshal.py', sha1='96348f5f2a26dc27d842d33cc3927e9da163436b'),
             dict(path='../../omlish/lite/maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
@@ -156,7 +156,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/inject.py', sha1='b039abbadf0b096d2724182af2e0ebda2a230852'),
             dict(path='../interp/default.py', sha1='a799969a0d3f4b57538587b13ceb08f6334ebc16'),
             dict(path='../interp/venvs.py', sha1='9ba8f2c3131d7d519d5cf36ca69b75f9c6fe2b27'),
-            dict(path='configs.py', sha1='28d20c0288eef4a5c61dd9b95071b7b15958b575'),
+            dict(path='configs.py', sha1='9e93e810184f9d6c7efd4a149dd5fbc9ad50d611'),
             dict(path='venvs.py', sha1='9f1935171017aeb802da56e14d7f41d632a7aa25'),
             dict(path='cli.py', sha1='ecf31ccef6b0e1d1505b46d24faf076b6be32760'),
         ],
@@ -2562,15 +2562,17 @@ class Checks:
 
     #
 
-    def _unpack_isinstance_spec(self, spec: ta.Any) -> tuple:
-        if isinstance(spec, type):
-            return (spec,)
+    def _unpack_isinstance_spec(self, spec: ta.Any) -> ta.Any:
+        if spec == ta.Any:
+            return object
+        if spec is None:
+            return None.__class__
         if not isinstance(spec, tuple):
-            spec = (spec,)
+            return spec
+        if ta.Any in spec:
+            return object
         if None in spec:
             spec = tuple(filter(None, spec)) + (None.__class__,)  # noqa
-        if ta.Any in spec:
-            spec = (object,)
         return spec
 
     @ta.overload
@@ -4408,33 +4410,15 @@ class SpecifierSet(BaseSpecifier):
 
 @dc.dataclass(frozen=True)
 class VersionsFile:
-    name: ta.Optional[str] = '.versions'
-
-    @staticmethod
-    def parse(s: str) -> ta.Mapping[str, str]:
-        return {
-            k: v
-            for l in s.splitlines()
-            if (sl := l.split('#')[0].strip())
-            for k, _, v in (sl.partition('='),)
-        }
+    name: ta.Optional[str] = '.python-versions.json'
 
     @cached_nullary
-    def contents(self) -> ta.Mapping[str, str]:
+    def pythons(self) -> ta.Mapping[str, str]:
         if not self.name or not os.path.exists(self.name):
             return {}
         with open(self.name) as f:
             s = f.read()
-        return self.parse(s)
-
-    @staticmethod
-    def get_pythons(d: ta.Mapping[str, str]) -> ta.Mapping[str, str]:
-        pfx = 'PYTHON_'
-        return {k[len(pfx):].lower(): v for k, v in d.items() if k.startswith(pfx)}
-
-    @cached_nullary
-    def pythons(self) -> ta.Mapping[str, str]:
-        return self.get_pythons(self.contents())
+        return json.loads(s)
 
 
 ########################################
@@ -12749,7 +12733,7 @@ class PyprojectConfig:
     venvs: ta.Mapping[str, VenvConfig] = dc.field(default_factory=dict)
 
     venvs_dir: str = '.venvs'
-    # versions_file: ta.Optional[str] = '.versions'  # FIXME:
+    # versions_file: ta.Optional[str] = '.python-versions.json'  # FIXME:
 
 
 class PyprojectConfigPreparer:

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev528
+Version: 0.0.0.dev529
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev528
+Requires-Dist: omlish==0.0.0.dev529
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev.egg-info/SOURCES.txt

@@ -163,8 +163,14 @@ omdev/dockerdev/gen.py
 omdev/dockerdev/helpers.py
 omdev/dockerdev/ops.py
 omdev/dockerdev/rendering.py
+omdev/dockerdev/resources/.pkgdata
+omdev/dockerdev/resources/.python-versions.json
 omdev/dockerdev/resources/__init__.py
 omdev/dockerdev/resources/xu
+omdev/dockerdev/resources/configs/.gdbinit
+omdev/dockerdev/resources/configs/.pkgdata
+omdev/dockerdev/resources/configs/.tmux.conf
+omdev/dockerdev/resources/configs/.vimrc
 omdev/dockerdev/resources/configs/__init__.py
 omdev/dockerdev/resources/depsets/__init__.py
 omdev/dockerdev/resources/depsets/python.toml

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev528
+omlish==0.0.0.dev529
 
 [all]
 black~=26.1

{omdev-0.0.0.dev528 → omdev-0.0.0.dev529}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev528'
+version = '0.0.0.dev529'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev528',
+    'omlish == 0.0.0.dev529',
 ]
 
 [project.optional-dependencies]
@@ -106,7 +106,9 @@ exclude = [
     'cc/cdeps.toml',
     'dockerdev/config.toml',
     'dockerdev/resources/*',
+    'dockerdev/resources/.*',
     'dockerdev/resources/configs/*',
+    'dockerdev/resources/configs/.*',
     'dockerdev/resources/depsets/*',
     'dockerdev/resources/fragments/*',
     'pyproject/resources/*.sh',

omdev-0.0.0.dev528/omdev/pyproject/versions.py

@@ -1,40 +0,0 @@
-# ruff: noqa: UP045
-import dataclasses as dc
-import os.path
-import typing as ta
-
-from omlish.lite.cached import cached_nullary
-
-
-##
-
-
-@dc.dataclass(frozen=True)
-class VersionsFile:
-    name: ta.Optional[str] = '.versions'
-
-    @staticmethod
-    def parse(s: str) -> ta.Mapping[str, str]:
-        return {
-            k: v
-            for l in s.splitlines()
-            if (sl := l.split('#')[0].strip())
-            for k, _, v in (sl.partition('='),)
-        }
-
-    @cached_nullary
-    def contents(self) -> ta.Mapping[str, str]:
-        if not self.name or not os.path.exists(self.name):
-            return {}
-        with open(self.name) as f:
-            s = f.read()
-        return self.parse(s)
-
-    @staticmethod
-    def get_pythons(d: ta.Mapping[str, str]) -> ta.Mapping[str, str]:
-        pfx = 'PYTHON_'
-        return {k[len(pfx):].lower(): v for k, v in d.items() if k.startswith(pfx)}
-
-    @cached_nullary
-    def pythons(self) -> ta.Mapping[str, str]:
-        return self.get_pythons(self.contents())