omdev 0.0.0.dev175__py3-none-any.whl → 0.0.0.dev177__py3-none-any.whl

omdev/interp/pyenv.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - custom tags
@@ -9,7 +10,6 @@ TODO:
  - optionally install / upgrade pyenv itself
  - new vers dont need these custom mac opts, only run on old vers
 """
-# ruff: noqa: UP006 UP007
 import abc
 import dataclasses as dc
 import itertools
@@ -319,11 +319,11 @@ class PyenvVersionInstaller:
             full_args = [
                 os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
                 *conf_args,
-                self.install_dir(),
+                await self.install_dir(),
             ]
         else:
             full_args = [
-                self._pyenv.exe(),
+                await self._pyenv.exe(),
                 'install',
                 *conf_args,
             ]

omdev/interp/standalone.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - ~/.cache/omlish/interp/standalone/...
@@ -20,7 +21,6 @@ TODO:
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # https://github.com/tusharsadhwani/yen/blob/8d1bb0c1232c7b0159caefb1bf3a5348b93f7b43/src/yen/github.py
-# ruff: noqa: UP006 UP007
 import json
 import os.path
 import platform
@@ -91,6 +91,7 @@ class StandalonePythons:
 
     def fallback_release_data(self) -> GitHubReleaseData:
         """Returns the fallback release data, for when GitHub API gives an error."""
+
         log.warning('GitHub unreachable. Using fallback release data.')
         data_file = os.path.join(os.path.dirname(__file__), 'fallback_release_data.json')
         with open(data_file) as data:
@@ -101,6 +102,7 @@ class StandalonePythons:
 
     def get_latest_python_releases(self, is_linux_i686: bool) -> GitHubReleaseData:
         """Returns the list of python download links from the latest github release."""
+
         # They stopped shipping for 32 bit linux since after the 20230826 tag
         if is_linux_i686:
             data_file = os.path.join(os.path.dirname(__file__), 'linux_i686_release.json')
@@ -120,6 +122,7 @@ class StandalonePythons:
     @cached_nullary
     def list_pythons(self) -> ta.Mapping[str, str]:
         """Returns available python versions for your machine and their download links."""
+
         system, machine = platform.system(), platform.machine()
         download_link_suffixes = self.MACHINE_SUFFIX[system][machine]
         # linux suffixes are nested under glibc or musl builds

omdev/interp/system.py

@@ -1,9 +1,9 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - python, python3, python3.12, ...
  - check if path py's are venvs: sys.prefix != sys.base_prefix
 """
-# ruff: noqa: UP006 UP007
 import dataclasses as dc
 import os
 import re

omdev/interp/uv.py

@@ -0,0 +1,21 @@
+# ruff: noqa: UP006 UP007
+"""
+uv run pip
+uv run --python 3.11.6 pip
+uv venv --python 3.11.6 --seed barf
+python3 -m venv barf && barf/bin/pip install uv && barf/bin/uv venv --python 3.11.6 --seed barf2
+"""
+import typing as ta
+
+from .providers import InterpProvider
+from .types import Interp
+from .types import InterpSpecifier
+from .types import InterpVersion
+
+
+class PyenvInterpProvider(InterpProvider):
+    def get_installed_versions(self, spec: InterpSpecifier) -> ta.Awaitable[ta.Sequence[InterpVersion]]:
+        raise NotImplementedError
+
+    def get_installed_version(self, version: InterpVersion) -> ta.Awaitable[Interp]:
+        raise NotImplementedError

omdev/scripts/interp.py

@@ -3156,11 +3156,11 @@ class PyenvVersionInstaller:
             full_args = [
                 os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
                 *conf_args,
-                self.install_dir(),
+                await self.install_dir(),
             ]
         else:
             full_args = [
-                self._pyenv.exe(),
+                await self._pyenv.exe(),
                 'install',
                 *conf_args,
             ]

omdev/scripts/pyproject.py

@@ -3916,6 +3916,18 @@ class FieldsObjMarshaler(ObjMarshaler):
         })
 
 
+@dc.dataclass(frozen=True)
+class SingleFieldObjMarshaler(ObjMarshaler):
+    ty: type
+    fld: str
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return getattr(o, self.fld)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(**{self.fld: o})
+
+
 @dc.dataclass(frozen=True)
 class PolymorphicObjMarshaler(ObjMarshaler):
     class Impl(ta.NamedTuple):
@@ -3990,7 +4002,7 @@ _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
     **{t: IterableObjMarshaler(t, DynamicObjMarshaler()) for t in (list, tuple, set, frozenset)},
     **{t: MappingObjMarshaler(t, DynamicObjMarshaler(), DynamicObjMarshaler()) for t in (dict,)},
 
-    ta.Any: DynamicObjMarshaler(),
+    **{t: DynamicObjMarshaler() for t in (ta.Any, object)},
 
     **{t: DatetimeObjMarshaler(t) for t in (datetime.date, datetime.time, datetime.datetime)},
     decimal.Decimal: DecimalObjMarshaler(),
@@ -4015,6 +4027,16 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 ##
 
 
+_REGISTERED_OBJ_MARSHALERS_BY_TYPE: ta.MutableMapping[type, ObjMarshaler] = weakref.WeakKeyDictionary()
+
+
+def register_type_obj_marshaler(ty: type, om: ObjMarshaler) -> None:
+    _REGISTERED_OBJ_MARSHALERS_BY_TYPE[ty] = om
+
+
+##
+
+
 class ObjMarshalerManager:
     def __init__(
             self,
@@ -4024,6 +4046,8 @@ class ObjMarshalerManager:
             default_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = _DEFAULT_OBJ_MARSHALERS,  # noqa
             generic_mapping_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES,  # noqa
             generic_iterable_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES,  # noqa
+
+            registered_obj_marshalers: ta.Mapping[type, ObjMarshaler] = _REGISTERED_OBJ_MARSHALERS_BY_TYPE,
     ) -> None:
         super().__init__()
 
@@ -4032,6 +4056,7 @@ class ObjMarshalerManager:
         self._obj_marshalers = dict(default_obj_marshalers)
         self._generic_mapping_types = generic_mapping_types
         self._generic_iterable_types = generic_iterable_types
+        self._registered_obj_marshalers = registered_obj_marshalers
 
         self._lock = threading.RLock()
         self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
@@ -4047,6 +4072,9 @@ class ObjMarshalerManager:
             non_strict_fields: bool = False,
     ) -> ObjMarshaler:
         if isinstance(ty, type):
+            if (reg := self._registered_obj_marshalers.get(ty)) is not None:
+                return reg
+
             if abc.ABC in ty.__bases__:
                 impls = [ity for ity in deep_subclasses(ty) if abc.ABC not in ity.__bases__]  # type: ignore
                 if all(ity.__qualname__.endswith(ty.__name__) for ity in impls):
@@ -4111,9 +4139,15 @@ class ObjMarshalerManager:
 
     #
 
-    def register_opj_marshaler(self, ty: ta.Any, m: ObjMarshaler) -> None:
+    def set_obj_marshaler(
+            self,
+            ty: ta.Any,
+            m: ObjMarshaler,
+            *,
+            override: bool = False,
+    ) -> None:
         with self._lock:
-            if ty in self._obj_marshalers:
+            if not override and ty in self._obj_marshalers:
                 raise KeyError(ty)
             self._obj_marshalers[ty] = m
 
@@ -4204,7 +4238,7 @@ class ObjMarshalContext:
 
 OBJ_MARSHALER_MANAGER = ObjMarshalerManager()
 
-register_opj_marshaler = OBJ_MARSHALER_MANAGER.register_opj_marshaler
+set_obj_marshaler = OBJ_MARSHALER_MANAGER.set_obj_marshaler
 get_obj_marshaler = OBJ_MARSHALER_MANAGER.get_obj_marshaler
 
 marshal_obj = OBJ_MARSHALER_MANAGER.marshal_obj
@@ -6326,11 +6360,11 @@ class PyenvVersionInstaller:
             full_args = [
                 os.path.join(check.not_none(await self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),  # noqa
                 *conf_args,
-                self.install_dir(),
+                await self.install_dir(),
             ]
         else:
             full_args = [
-                self._pyenv.exe(),
+                await self._pyenv.exe(),
                 'install',
                 *conf_args,
             ]

{omdev-0.0.0.dev175.dist-info → omdev-0.0.0.dev177.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev175
+Version: 0.0.0.dev177
 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.dev175
+Requires-Dist: omlish==0.0.0.dev177
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev175.dist-info → omdev-0.0.0.dev177.dist-info}/RECORD

@@ -85,11 +85,12 @@ omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
 omdev/interp/cli.py,sha256=kgqA-Pc2RVkvkEpAKde30R5JKemgwurUcG6uPaNJyFc,2234
 omdev/interp/inspect.py,sha256=ORfO90xfGftyvEJHuEOD5yPk-9mxdxn27SYHwZywWFI,2888
 omdev/interp/providers.py,sha256=yHZQ6gYjkvSmMBvrKy3I77D7PnW67Bf3igTKY8DD9K4,1839
-omdev/interp/pyenv.py,sha256=8SromtT5y6f5q0hT__-r5PZSOHg-PQc-6t-ITdS5eo4,14302
+omdev/interp/pyenv.py,sha256=KgsAwVNdse8UAR_6Lt4V4Zxqgm-kteOpJHxiD5vKc4M,14314
 omdev/interp/resolvers.py,sha256=_xxmf9KrWg5Zpi4UjAMKMB8UgrXLq_sJ2Y5qpNhLjqw,3091
-omdev/interp/standalone.py,sha256=As4sDe9_Iq0b00Q28BaiEjnk9pRR6qq1fjSKnveqgfc,7722
-omdev/interp/system.py,sha256=-ihkrZbUFpnZu0Au4kQbl5oqQSXDtGabTTmn7fhTBts,3561
+omdev/interp/standalone.py,sha256=jJnncea4PIuaW-KwD2YiWDn8zTmwmsJNUKpF-qC2bwo,7725
+omdev/interp/system.py,sha256=-sIbIPgmDU9jKw_nw-zTgOertDJTJ6BwJ-i6fU81KsY,3561
 omdev/interp/types.py,sha256=5dFGYyaCrXN-VL43PhBvlEti97fYW3EzfBmK9N4Wmdo,2496
+omdev/interp/uv.py,sha256=6EF5i_n530F9KUa99xT6RB8vF6FSqElDHu3lbk1ppBo,662
 omdev/magic/__init__.py,sha256=CBzRB71RLyylkrj8dph6JUEddA8KSMJvDgriHqFfJGU,478
 omdev/magic/find.py,sha256=tTmpWXAleaXG3_kNOsRF7s8D0CpYMXbdz6-HbCNBW90,7070
 omdev/magic/magic.py,sha256=h1nxoW6CV1MRCiHjDt3sO4kmG0qTtTRbkDNiPLGo2BE,224
@@ -134,8 +135,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=Bdtcovhk8Sa8-LmbGyz5TLty7RI3W_DAjxjGQJUvR6s,100905
-omdev/scripts/pyproject.py,sha256=oe2zzPZRMnvIpZVRc9pg3ihXuhWy0q7fZerzGR0ZmB0,206497
+omdev/scripts/interp.py,sha256=ReEfpyIB5UfJXFdnOLylO1czk51ZoskoNkSQkjaQ4CA,100917
+omdev/scripts/pyproject.py,sha256=y-E70h9al-ijgogYqTlCqmMT53o0iW8D2F2MjPFuKuU,207462
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -164,9 +165,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 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=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev175.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev175.dist-info/METADATA,sha256=e0d6AF8lWfqrpDr6If32qrD6JO06ObWzezSYXu1-K9E,1760
-omdev-0.0.0.dev175.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev175.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev175.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev175.dist-info/RECORD,,
+omdev-0.0.0.dev177.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev177.dist-info/METADATA,sha256=Kg8GR5oTBzACAwXukDJ3oLe71RG42r87qe_3H8R1M64,1760
+omdev-0.0.0.dev177.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev177.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev177.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev177.dist-info/RECORD,,