ominfra 0.0.0.dev204__py3-none-any.whl → 0.0.0.dev205__py3-none-any.whl

ominfra/manage/deploy/git.py

@@ -10,7 +10,7 @@ import functools
 import os.path
 import typing as ta
 
-from omdev.git.subtrees import GitSubtreeCloner
+from omdev.git.shallow import GitShallowCloner
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.check import check
@@ -154,7 +154,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
         ) as dst_swap:
             tdn = '.omlish-git-shallow-clone'
 
-            for cmd in GitSubtreeCloner(
+            for cmd in GitShallowCloner(
                     base_dir=dst_swap.tmp_path,
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,

ominfra/pyremote.py

@@ -381,6 +381,7 @@ class PyremoteBootstrapDriver:
         self._payload_z = zlib.compress(self._prepared_payload_src.encode('utf-8'))
 
         self._options_json = json.dumps(dc.asdict(options), indent=None, separators=(',', ':')).encode('utf-8')  # noqa
+
     #
 
     @classmethod

ominfra/scripts/manage.py

@@ -968,6 +968,7 @@ class PyremoteBootstrapDriver:
         self._payload_z = zlib.compress(self._prepared_payload_src.encode('utf-8'))
 
         self._options_json = json.dumps(dc.asdict(options), indent=None, separators=(',', ':')).encode('utf-8')  # noqa
+
     #
 
     @classmethod
@@ -8349,11 +8350,11 @@ class AbstractAsyncSubprocesses(BaseSubprocesses):
 
 
 ########################################
-# ../../../omdev/git/subtrees.py
+# ../../../omdev/git/shallow.py
 
 
 @dc.dataclass(frozen=True)
-class GitSubtreeCloner:
+class GitShallowCloner:
     base_dir: str
     repo_url: str
     repo_dir: str
@@ -8382,14 +8383,14 @@ class GitSubtreeCloner:
             '-c', 'advice.detachedHead=false',
         ]
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
                 'clone',
                 '-n',
                 '--depth=1',
-                '--filter=tree:0',
+                *(['--filter=tree:0'] if self.repo_subtrees is not None else []),
                 *(['-b', self.branch] if self.branch else []),
                 '--single-branch',
                 self.repo_url,
@@ -8399,19 +8400,20 @@ class GitSubtreeCloner:
         )
 
         rd = os.path.join(self.base_dir, self.repo_dir)
-        yield GitSubtreeCloner.Command(
-            cmd=(
-                'git',
-                *git_opts,
-                'sparse-checkout',
-                'set',
-                '--no-cone',
-                *(self.repo_subtrees or []),
-            ),
-            cwd=rd,
-        )
+        if self.repo_subtrees is not None:
+            yield GitShallowCloner.Command(
+                cmd=(
+                    'git',
+                    *git_opts,
+                    'sparse-checkout',
+                    'set',
+                    '--no-cone',
+                    *self.repo_subtrees,
+                ),
+                cwd=rd,
+            )
 
-        yield GitSubtreeCloner.Command(
+        yield GitShallowCloner.Command(
             cmd=(
                 'git',
                 *git_opts,
@@ -8422,7 +8424,7 @@ class GitSubtreeCloner:
         )
 
 
-def git_clone_subtree(
+def git_shallow_clone(
         *,
         base_dir: str,
         repo_url: str,
@@ -8431,7 +8433,7 @@ def git_clone_subtree(
         rev: ta.Optional[str] = None,
         repo_subtrees: ta.Optional[ta.Sequence[str]] = None,
 ) -> None:
-    for cmd in GitSubtreeCloner(
+    for cmd in GitShallowCloner(
         base_dir=base_dir,
         repo_url=repo_url,
         repo_dir=repo_dir,
@@ -11455,7 +11457,7 @@ class DeployGitManager(SingleDirDeployPathOwner):
         ) as dst_swap:
             tdn = '.omlish-git-shallow-clone'
 
-            for cmd in GitSubtreeCloner(
+            for cmd in GitShallowCloner(
                     base_dir=dst_swap.tmp_path,
                     repo_url=self.make_repo_url(spec.repo),
                     repo_dir=tdn,

{ominfra-0.0.0.dev204.dist-info → ominfra-0.0.0.dev205.dist-info}/METADATA

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

{ominfra-0.0.0.dev204.dist-info → ominfra-0.0.0.dev205.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ominfra/.manifests.json,sha256=8KREXxMAlsilZOktXPYru1ND3V5hFI22vnrp6hT3bio,589
 ominfra/__about__.py,sha256=_gUs3H7uunGy5IfGw3mq4dFJWaF1mecSPruJPyjbs7Y,741
 ominfra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/pyremote.py,sha256=HLfAZl3Xw5CpxLS5PS380zqCyE7n3vKVksIYT2Fbdc8,15197
+ominfra/pyremote.py,sha256=qjY3Bj0GhuYznQ3bhqXmU9zyIVZkhD9Wv76QUG34ZME,15198
 ominfra/systemd.py,sha256=d61NVrJoItzSaqhMDgKGrQjbrxEVAujUMDsj8WggXos,1022
 ominfra/threadworkers.py,sha256=oX4ubZn7h932saXpRIJu2MNhBExgGGMuGhdXarZxLJw,4948
 ominfra/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -62,7 +62,7 @@ ominfra/manage/deploy/apps.py,sha256=T0eU0Jw-h33_ZPIs0zy9DOx_fgs3YSAAGzu-H0pvt2U
 ominfra/manage/deploy/commands.py,sha256=OVZzSY4EP_SD7KJRkIIPeqUxcV4mcwrc_WYNvM16ahM,830
 ominfra/manage/deploy/config.py,sha256=kPpl8TRisz295cM4oj-RHA6oh5jdcJ_N9pVpkl_doO8,114
 ominfra/manage/deploy/deploy.py,sha256=YRr_0OPIZJ9LnOeMaHYCSSvqh81a5_LB7OZy-bR2GeA,8966
-ominfra/manage/deploy/git.py,sha256=ILrIPSy-6JObg3xBzIcDwe-iPQt-AiiL2J6AX4l3Pco,5534
+ominfra/manage/deploy/git.py,sha256=FkqLy26q8I9J2_UQs_ViY5qNd8qQikAzfXdMRqNIK4Q,5533
 ominfra/manage/deploy/inject.py,sha256=XeBMwoCsKhO-4VffCVgXOrp_tTAYt15AyVmc4vvIDso,3472
 ominfra/manage/deploy/injection.py,sha256=LR7gEkVx2ldUoQZsGvIcm1Y4QXCVDnLIAdc3LHhQiD4,392
 ominfra/manage/deploy/interp.py,sha256=_5fuHrY5ZA0eGbnNcOqAhAMSWI1UNvbm0l29eDjE5fI,1037
@@ -107,7 +107,7 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=Bo_24qN3YI_72BcZYBHid9_SJWnCAmbKRJ3-wE6dGMU,166250
-ominfra/scripts/manage.py,sha256=lqX1VW3AJakfypxc67HvUwj3HFWJKPtuAXU7Rz1S83c,357150
+ominfra/scripts/manage.py,sha256=QlG02s1uAJ4sFTRuR50HpinKp-B7-P0yAEHxikRonA0,357276
 ominfra/scripts/supervisor.py,sha256=6OQnZfnHfXT-hHsGQA_OhA_BjOs01vzInkmEZWYhiVY,291847
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -150,9 +150,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev204.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev204.dist-info/METADATA,sha256=mICNA2ytXn4-Dm4mRIHx-EvXRS8lfssNlAERgcogcaw,767
-ominfra-0.0.0.dev204.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev204.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev204.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev204.dist-info/RECORD,,
+ominfra-0.0.0.dev205.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev205.dist-info/METADATA,sha256=UdNebk1Hka0z9cWJhDpM6DWQmO6-L4dFqOAfibSn6GA,767
+ominfra-0.0.0.dev205.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev205.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev205.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev205.dist-info/RECORD,,