ominfra 0.0.0.dev162__tar.gz → 0.0.0.dev163__tar.gz

{ominfra-0.0.0.dev162/ominfra.egg-info → ominfra-0.0.0.dev163}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev162
+Version: 0.0.0.dev163
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev162
-Requires-Dist: omlish==0.0.0.dev162
+Requires-Dist: omdev==0.0.0.dev163
+Requires-Dist: omlish==0.0.0.dev163
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/ominfra/manage/deploy/apps.py

@@ -51,7 +51,7 @@ class DeployAppManager(DeployPathOwner):
 
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
         return {
-            DeployPath.parse('apps/@app/@tag'),
+            DeployPath.parse('apps/@app/@tag/'),
         }
 
     async def prepare_app(
@@ -70,4 +70,5 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
-        await self._venvs.setup_app_venv(app_tag)
+        if spec.venv is not None:
+            await self._venvs.setup_app_venv(app_tag, spec.venv)

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/ominfra/manage/deploy/specs.py

@@ -43,11 +43,29 @@ class DeployGitCheckout:
 ##
 
 
+@dc.dataclass(frozen=True)
+class DeployVenvSpec:
+    interp: ta.Optional[str] = None
+
+    requirements_files: ta.Optional[ta.Sequence[str]] = None
+    extra_dependencies: ta.Optional[ta.Sequence[str]] = None
+
+    use_uv: bool = False
+
+    def __post_init__(self) -> None:
+        hash(self)
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class DeploySpec:
     app: DeployApp
     checkout: DeployGitCheckout
 
+    venv: ta.Optional[DeployVenvSpec] = None
+
     def __post_init__(self) -> None:
         hash(self)
 

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/ominfra/manage/deploy/venvs.py

@@ -14,6 +14,7 @@ from omlish.os.atomics import AtomicPathSwapping
 
 from .paths import DeployPath
 from .paths import DeployPathOwner
+from .specs import DeployVenvSpec
 from .types import DeployAppTag
 from .types import DeployHome
 
@@ -43,8 +44,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             app_dir: str,
             venv_dir: str,
-            *,
-            use_uv: bool = True,
+            spec: DeployVenvSpec,
     ) -> None:
         sys_exe = 'python3'
 
@@ -61,7 +61,7 @@ class DeployVenvManager(DeployPathOwner):
         reqs_txt = os.path.join(app_dir, 'requirements.txt')
 
         if os.path.isfile(reqs_txt):
-            if use_uv:
+            if spec.use_uv:
                 await asyncio_subprocesses.check_call(venv_exe, '-m', 'pip', 'install', 'uv')
                 pip_cmd = ['-m', 'uv', 'pip']
             else:
@@ -69,8 +69,13 @@ class DeployVenvManager(DeployPathOwner):
 
             await asyncio_subprocesses.check_call(venv_exe, *pip_cmd,'install', '-r', reqs_txt)
 
-    async def setup_app_venv(self, app_tag: DeployAppTag) -> None:
+    async def setup_app_venv(
+            self,
+            app_tag: DeployAppTag,
+            spec: DeployVenvSpec,
+    ) -> None:
         await self.setup_venv(
             os.path.join(check.non_empty_str(self._deploy_home), 'apps', app_tag.app, app_tag.tag),
             os.path.join(self._dir(), app_tag.app, app_tag.tag),
+            spec,
         )

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/ominfra/scripts/manage.py

@@ -4329,11 +4329,29 @@ class DeployGitCheckout:
 ##
 
 
+@dc.dataclass(frozen=True)
+class DeployVenvSpec:
+    interp: ta.Optional[str] = None
+
+    requirements_files: ta.Optional[ta.Sequence[str]] = None
+    extra_dependencies: ta.Optional[ta.Sequence[str]] = None
+
+    use_uv: bool = False
+
+    def __post_init__(self) -> None:
+        hash(self)
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class DeploySpec:
     app: DeployApp
     checkout: DeployGitCheckout
 
+    venv: ta.Optional[DeployVenvSpec] = None
+
     def __post_init__(self) -> None:
         hash(self)
 
@@ -8284,8 +8302,7 @@ class DeployVenvManager(DeployPathOwner):
             self,
             app_dir: str,
             venv_dir: str,
-            *,
-            use_uv: bool = True,
+            spec: DeployVenvSpec,
     ) -> None:
         sys_exe = 'python3'
 
@@ -8302,7 +8319,7 @@ class DeployVenvManager(DeployPathOwner):
         reqs_txt = os.path.join(app_dir, 'requirements.txt')
 
         if os.path.isfile(reqs_txt):
-            if use_uv:
+            if spec.use_uv:
                 await asyncio_subprocesses.check_call(venv_exe, '-m', 'pip', 'install', 'uv')
                 pip_cmd = ['-m', 'uv', 'pip']
             else:
@@ -8310,10 +8327,15 @@ class DeployVenvManager(DeployPathOwner):
 
             await asyncio_subprocesses.check_call(venv_exe, *pip_cmd,'install', '-r', reqs_txt)
 
-    async def setup_app_venv(self, app_tag: DeployAppTag) -> None:
+    async def setup_app_venv(
+            self,
+            app_tag: DeployAppTag,
+            spec: DeployVenvSpec,
+    ) -> None:
         await self.setup_venv(
             os.path.join(check.non_empty_str(self._deploy_home), 'apps', app_tag.app, app_tag.tag),
             os.path.join(self._dir(), app_tag.app, app_tag.tag),
+            spec,
         )
 
 
@@ -8879,7 +8901,7 @@ class DeployAppManager(DeployPathOwner):
 
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
         return {
-            DeployPath.parse('apps/@app/@tag'),
+            DeployPath.parse('apps/@app/@tag/'),
         }
 
     async def prepare_app(
@@ -8898,7 +8920,8 @@ class DeployAppManager(DeployPathOwner):
 
         #
 
-        await self._venvs.setup_app_venv(app_tag)
+        if spec.venv is not None:
+            await self._venvs.setup_app_venv(app_tag, spec.venv)
 
 
 ########################################

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev162
+Version: 0.0.0.dev163
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev162
-Requires-Dist: omlish==0.0.0.dev162
+Requires-Dist: omdev==0.0.0.dev163
+Requires-Dist: omlish==0.0.0.dev163
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev162
-omlish==0.0.0.dev162
+omdev==0.0.0.dev163
+omlish==0.0.0.dev163
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev162 → ominfra-0.0.0.dev163}/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.dev162'
+version = '0.0.0.dev163'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev162',
-    'omlish == 0.0.0.dev162',
+    'omdev == 0.0.0.dev163',
+    'omlish == 0.0.0.dev163',
 ]
 
 [project.optional-dependencies]