omdev 0.0.0.dev518__tar.gz → 0.0.0.dev520__tar.gz

{omdev-0.0.0.dev518/omdev.egg-info → omdev-0.0.0.dev520}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev518
+Version: 0.0.0.dev520
 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.dev518
+Requires-Dist: omlish==0.0.0.dev520
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='../../omlish/lite/check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -373,8 +373,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -408,8 +410,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/dockerdev/gen.py

@@ -9,7 +9,7 @@ from .content import Resource
 from .helpers import APT_CACHE_MOUNTS
 from .helpers import fragment_section
 from .helpers import read_versions_file_versions
-from .helpers import render_apt_install_deps
+from .helpers import render_apt_install_dep_sets
 from .ops import Cmd
 from .ops import Entrypoint
 from .ops import Env
@@ -27,6 +27,12 @@ from .rendering import render_op
 
 BASE_IMAGE = 'ubuntu:24.04'
 
+DEP_SETS: ta.Sequence[str] = [
+    'system',
+    'python',
+    'x11',
+]
+
 JDKS: ta.Sequence[str] = [
     'zulu21-ca-jdk',
     'zulu25-ca-jdk',
@@ -78,7 +84,7 @@ OPS: ta.Sequence[Op] = [
         Run(
             [
                 Resource('fragments/apt.sh'),
-                LazyContent(render_apt_install_deps),
+                LazyContent(lambda: render_apt_install_dep_sets(*DEP_SETS)),
             ],
             cache_mounts=APT_CACHE_MOUNTS,
         ),

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/dockerdev/helpers.py

@@ -43,15 +43,12 @@ APT_CACHE_MOUNTS: ta.Sequence[str] = [
 ]
 
 
-def render_apt_install_deps() -> str:
+def render_apt_install_dep_sets(*names: str) -> str:
     out = io.StringIO()
 
     dsl: list[tuple[str, ta.Sequence[str]]] = []
 
-    for dsn in [
-        'tools',
-        'python',
-    ]:
+    for dsn in names:
         dso = tomllib.loads(read_resource(Resource(f'depsets/{dsn}.toml')))
         dsl.append((dsn, sorted(set(dso['deps']))))
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='../../omlish/lite/check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -489,8 +489,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -524,8 +526,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/manifests/building.py

@@ -154,7 +154,7 @@ class ManifestBuilder:
 
         mod_name = file.rpartition('.')[0].replace(os.sep, '.')
         mod_base = mod_name.split('.')[0]
-        if mod_base != (first_dir := file.split(os.path.sep)[0]):
+        if mod_base != (first_dir := file.split(os.path.sep, maxsplit=1)[0]):
             raise Exception(f'Unexpected module base: {mod_base=} != {first_dir=}')
 
         return ManifestBuilder.FileModule(

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/packaging/marshal.py

@@ -68,7 +68,6 @@ def _install_standard_marshaling() -> None:
     msh.install_standard_factories(
         msh.PolymorphismMarshalerFactory(requires_node_poly),
         msh.PolymorphismUnmarshalerFactory(requires_node_poly),
-        msh.PolymorphismUnionMarshalerFactory(requires_node_poly.impls, allow_partial=True),
     )
 
     msh.install_standard_factories(

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/py/asts/toplevel.py

@@ -48,7 +48,7 @@ class _TopLevelModuleVisitor(ast.NodeVisitor):
 
     def visit_Import(self, node: ast.Import) -> None:
         for alias in node.names:
-            name = alias.asname if alias.asname else alias.name
+            name = alias.asname or alias.name
             self.imports[name] = TopLevelImport(
                 spec=alias.name,
                 name=name,
@@ -68,7 +68,7 @@ class _TopLevelModuleVisitor(ast.NodeVisitor):
             module = check.not_none(node.module)
 
         for alias in node.names:
-            name = alias.asname if alias.asname else alias.name
+            name = alias.asname or alias.name
             self.imports[name] = TopLevelImport(
                 spec='.'.join([module, alias.name]),
                 name=name,

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev/scripts/ci.py

@@ -99,7 +99,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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='../../omlish/lite/check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='73b7f5e5493c7ed12ff0ce36e37b596e5984cb08'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
@@ -1185,8 +1185,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -1220,8 +1222,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='../../omlish/lite/check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -982,8 +982,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -1017,8 +1019,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='inject.py', sha1='6f097e3170019a34ff6834d36fcc9cbeed3a7ab4'),
@@ -373,8 +373,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -408,8 +410,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -374,8 +374,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -409,8 +411,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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='7996e893097b9318089017b1342c9965d4024eb0'),
+            dict(path='../../omlish/lite/check.py', sha1='0d5908513e452593ec345fe4cb5f8e33f5e5876c'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -2602,8 +2602,10 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None):
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.isinstance(v, spec, msg)
 
         return inner
 
@@ -2637,8 +2639,10 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None) -> ta.Callable[[T], T]:
+        spec = self._unpack_isinstance_spec(spec)
+
         def inner(v):
-            return self.not_isinstance(v, self._unpack_isinstance_spec(spec), msg)
+            return self.not_isinstance(v, spec, msg)
 
         return inner
 

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev518
+Version: 0.0.0.dev520
 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.dev518
+Requires-Dist: omlish==0.0.0.dev520
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev.egg-info/SOURCES.txt

@@ -167,7 +167,7 @@ omdev/dockerdev/resources/xu
 omdev/dockerdev/resources/configs/__init__.py
 omdev/dockerdev/resources/depsets/__init__.py
 omdev/dockerdev/resources/depsets/python.toml
-omdev/dockerdev/resources/depsets/tools.toml
+omdev/dockerdev/resources/depsets/system.toml
 omdev/dockerdev/resources/depsets/x11.toml
 omdev/dockerdev/resources/fragments/__init__.py
 omdev/dockerdev/resources/fragments/apt.sh

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev518 → omdev-0.0.0.dev520}/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.dev518'
+version = '0.0.0.dev520'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev518',
+    'omlish == 0.0.0.dev520',
 ]
 
 [project.optional-dependencies]