omdev 0.0.0.dev517__tar.gz → 0.0.0.dev519__tar.gz

{omdev-0.0.0.dev517/omdev.egg-info → omdev-0.0.0.dev519}/PKG-INFO

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

{omdev-0.0.0.dev517 → omdev-0.0.0.dev519}/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.dev517 → omdev-0.0.0.dev519}/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.dev517 → omdev-0.0.0.dev519}/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.dev517 → omdev-0.0.0.dev519}/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.dev517 → omdev-0.0.0.dev519/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev517 → omdev-0.0.0.dev519}/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.dev517 → omdev-0.0.0.dev519}/omdev.egg-info/requires.txt

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

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