omdev 0.0.0.dev226__py3-none-any.whl → 0.0.0.dev228__py3-none-any.whl

omdev/__about__.py

@@ -13,7 +13,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'black': [
-            'black ~= 24.10',
+            'black ~= 25.1',
         ],
 
         'c': [
@@ -46,7 +46,7 @@ class Project(ProjectBase):
         ],
 
         'wheel': [
-            'wheel ~= 0.44',
+            'wheel ~= 0.45',
         ],
     }
 

omdev/ci/cache.py

@@ -1,10 +1,17 @@
 # ruff: noqa: UP006 UP007
+"""
+TODO:
+ - os.mtime, Config.purge_after_days
+  - nice to have: get a total set of might-need keys ahead of time and keep those
+  - okay: just purge after running
+"""
 import abc
 import asyncio
 import dataclasses as dc
 import functools
 import os.path
 import shutil
+import time
 import typing as ta
 import urllib.request
 
@@ -70,6 +77,11 @@ class DirectoryFileCache(FileCache):
         no_create: bool = False
         no_purge: bool = False
 
+        no_update_mtime: bool = False
+
+        purge_max_age_s: ta.Optional[float] = None
+        purge_max_size_b: ta.Optional[int] = None
+
     def __init__(
             self,
             config: Config,
@@ -90,6 +102,12 @@ class DirectoryFileCache(FileCache):
 
     VERSION_FILE_NAME = '.ci-cache-version'
 
+    def _iter_dir_contents(self) -> ta.Iterator[str]:
+        for n in sorted(os.listdir(self.dir)):
+            if n.startswith('.'):
+                continue
+            yield os.path.join(self.dir, n)
+
     @cached_nullary
     def setup_dir(self) -> None:
         version_file = os.path.join(self.dir, self.VERSION_FILE_NAME)
@@ -120,10 +138,7 @@ class DirectoryFileCache(FileCache):
                 f'due to present directories: {", ".join(dirs)}',
             )
 
-        for n in sorted(os.listdir(self.dir)):
-            if n.startswith('.'):
-                continue
-            fp = os.path.join(self.dir, n)
+        for fp in self._iter_dir_contents():
             check.state(os.path.isfile(fp))
             log.debug('Purging stale cache file: %s', fp)
             os.unlink(fp)
@@ -135,6 +150,42 @@ class DirectoryFileCache(FileCache):
 
     #
 
+    def purge(self, *, dry_run: bool = False) -> None:
+        purge_max_age_s = self._config.purge_max_age_s
+        purge_max_size_b = self._config.purge_max_size_b
+        if self._config.no_purge or (purge_max_age_s is None and purge_max_size_b is None):
+            return
+
+        self.setup_dir()
+
+        purge_min_mtime: ta.Optional[float] = None
+        if purge_max_age_s is not None:
+            purge_min_mtime = time.time() - purge_max_age_s
+
+        dct: ta.Dict[str, os.stat_result] = {}
+        for fp in self._iter_dir_contents():
+            check.state(os.path.isfile(fp))
+            dct[fp] = os.stat(fp)
+
+        total_size_b = 0
+        for fp, st in sorted(dct.items(), key=lambda t: -t[1].st_mtime):
+            total_size_b += st.st_size
+
+            purge = False
+            if purge_min_mtime is not None and st.st_mtime < purge_min_mtime:
+                purge = True
+            if purge_max_size_b is not None and total_size_b >= purge_max_size_b:
+                purge = True
+
+            if not purge:
+                continue
+
+            log.debug('Purging cache file: %s', fp)
+            if not dry_run:
+                os.unlink(fp)
+
+    #
+
     def get_cache_file_path(
             self,
             key: str,
@@ -151,6 +202,11 @@ class DirectoryFileCache(FileCache):
         cache_file_path = self.get_cache_file_path(key)
         if not os.path.exists(cache_file_path):
             return None
+
+        if not self._config.no_update_mtime:
+            stat_info = os.stat(cache_file_path)
+            os.utime(cache_file_path, (stat_info.st_atime, time.time()))
+
         return cache_file_path
 
     async def put_file(

omdev/ci/cli.py

@@ -25,6 +25,7 @@ from omlish.lite.inject import inj
 from omlish.lite.logs import log
 from omlish.logs.standard import configure_standard_logging
 
+from .cache import DirectoryFileCache
 from .ci import Ci
 from .compose import get_compose_service_dependencies
 from .github.bootstrap import is_in_github_actions
@@ -70,6 +71,9 @@ class CiCli(ArgparseCli):
 
     #
 
+    DEFAULT_PURGE_MAX_AGE_S = 60 * 60 * 24 * 30
+    DEFAULT_PURGE_MAX_SIZE_B = 1024 * 1024 * 1024 * 4
+
     @argparse_cmd(
         argparse_arg('project-dir'),
         argparse_arg('service'),
@@ -79,6 +83,8 @@ class CiCli(ArgparseCli):
 
         argparse_arg('--cache-dir'),
 
+        argparse_arg('--no-purge', action='store_true'),
+
         argparse_arg('--github', action='store_true'),
         argparse_arg('--github-detect', action='store_true'),
 
@@ -202,17 +208,32 @@ class CiCli(ArgparseCli):
             run_options=run_options,
         )
 
+        directory_file_cache_config: ta.Optional[DirectoryFileCache.Config] = None
+        if cache_dir is not None:
+            directory_file_cache_config = DirectoryFileCache.Config(
+                dir=cache_dir,
+
+                no_purge=bool(self.args.no_purge),
+
+                purge_max_age_s=self.DEFAULT_PURGE_MAX_AGE_S,
+                purge_max_size_b=self.DEFAULT_PURGE_MAX_SIZE_B,
+            )
+
         injector = inj.create_injector(bind_ci(
             config=config,
 
-            github=github,
+            directory_file_cache_config=directory_file_cache_config,
 
-            cache_dir=cache_dir,
+            github=github,
         ))
 
         async with injector[Ci] as ci:
             await ci.run()
 
+        if directory_file_cache_config is not None and not directory_file_cache_config.no_purge:
+            dfc = injector[DirectoryFileCache]
+            dfc.purge()
+
 
 async def _async_main() -> ta.Optional[int]:
     return await CiCli().async_cli_run()

omdev/ci/github/cache.py

@@ -21,14 +21,16 @@ from .client import GithubCacheServiceV1Client
 class GithubCache(FileCache, DataCache):
     @dc.dataclass(frozen=True)
     class Config:
-        dir: str
+        pass
 
     def __init__(
             self,
-            config: Config,
+            config: Config = Config(),
             *,
             client: ta.Optional[GithubCacheClient] = None,
             version: ta.Optional[CacheVersion] = None,
+
+            local: DirectoryFileCache,
     ) -> None:
         super().__init__(
             version=version,
@@ -42,12 +44,7 @@ class GithubCache(FileCache, DataCache):
             )
         self._client: GithubCacheClient = client
 
-        self._local = DirectoryFileCache(
-            DirectoryFileCache.Config(
-                dir=check.non_empty_str(config.dir),
-            ),
-            version=self._version,
-        )
+        self._local = local
 
     #
 

omdev/ci/github/inject.py

@@ -12,19 +12,10 @@ from .cache import GithubCache
 ##
 
 
-def bind_github(
-        *,
-        cache_dir: ta.Optional[str] = None,
-) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    if cache_dir is not None:
-        lst.extend([
-            inj.bind(GithubCache.Config(
-                dir=cache_dir,
-            )),
-            inj.bind(GithubCache, singleton=True),
-            inj.bind(FileCache, to_key=GithubCache),
-        ])
+def bind_github() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(GithubCache, singleton=True),
+        inj.bind(FileCache, to_key=GithubCache),
+    ]
 
     return inj.as_bindings(*lst)

omdev/ci/inject.py

@@ -21,9 +21,9 @@ def bind_ci(
         *,
         config: Ci.Config,
 
-        github: bool = False,
+        directory_file_cache_config: ta.Optional[DirectoryFileCache.Config] = None,
 
-        cache_dir: ta.Optional[str] = None,
+        github: bool = False,
 ) -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [  # noqa
         inj.bind(config),
@@ -42,20 +42,15 @@ def bind_ci(
         ),
     ))
 
-    if cache_dir is not None:
-        if github:
-            lst.append(bind_github(
-                cache_dir=cache_dir,
-            ))
+    if directory_file_cache_config is not None:
+        lst.extend([
+            inj.bind(directory_file_cache_config),
+            inj.bind(DirectoryFileCache, singleton=True),
+        ])
 
+        if github:
+            lst.append(bind_github())
         else:
-            lst.extend([
-                inj.bind(DirectoryFileCache.Config(
-                    dir=cache_dir,
-                )),
-                inj.bind(DirectoryFileCache, singleton=True),
-                inj.bind(FileCache, to_key=DirectoryFileCache),
-
-            ])
+            lst.append(inj.bind(FileCache, to_key=DirectoryFileCache))
 
     return inj.as_bindings(*lst)

omdev/scripts/ci.py

@@ -24,6 +24,8 @@ import contextlib
 import contextvars
 import dataclasses as dc
 import datetime
+import errno
+import fcntl
 import functools
 import hashlib
 import http.client
@@ -1094,7 +1096,7 @@ class Timeout(abc.ABC):
 
     @classmethod
     def _now(cls) -> float:
-        return time.time()
+        return time.monotonic()
 
     #
 
@@ -1417,20 +1419,33 @@ log_timing_context = LogTimingContext
 # ../../../omlish/os/files.py
 
 
-def touch(self, mode: int = 0o666, exist_ok: bool = True) -> None:
+def is_fd_open(fd: int) -> bool:
+    try:
+        fcntl.fcntl(fd, fcntl.F_GETFD)
+    except OSError as e:
+        if e.errno == errno.EBADF:
+            return False
+        raise
+    else:
+        return True
+
+
+def touch(path: str, mode: int = 0o666, exist_ok: bool = True) -> None:
     if exist_ok:
         # First try to bump modification time
         # Implementation note: GNU touch uses the UTIME_NOW option of the utimensat() / futimens() functions.
         try:
-            os.utime(self, None)
+            os.utime(path, None)
         except OSError:
             pass
         else:
             return
+
     flags = os.O_CREAT | os.O_WRONLY
     if not exist_ok:
         flags |= os.O_EXCL
-    fd = os.open(self, flags, mode)
+
+    fd = os.open(path, flags, mode)
     os.close(fd)
 
 
@@ -3458,6 +3473,12 @@ class SubprocessRunnable(abc.ABC, ta.Generic[T]):
 
 ########################################
 # ../cache.py
+"""
+TODO:
+ - os.mtime, Config.purge_after_days
+  - nice to have: get a total set of might-need keys ahead of time and keep those
+  - okay: just purge after running
+"""
 
 
 CacheVersion = ta.NewType('CacheVersion', int)
@@ -3514,6 +3535,11 @@ class DirectoryFileCache(FileCache):
         no_create: bool = False
         no_purge: bool = False
 
+        no_update_mtime: bool = False
+
+        purge_max_age_s: ta.Optional[float] = None
+        purge_max_size_b: ta.Optional[int] = None
+
     def __init__(
             self,
             config: Config,
@@ -3534,6 +3560,12 @@ class DirectoryFileCache(FileCache):
 
     VERSION_FILE_NAME = '.ci-cache-version'
 
+    def _iter_dir_contents(self) -> ta.Iterator[str]:
+        for n in sorted(os.listdir(self.dir)):
+            if n.startswith('.'):
+                continue
+            yield os.path.join(self.dir, n)
+
     @cached_nullary
     def setup_dir(self) -> None:
         version_file = os.path.join(self.dir, self.VERSION_FILE_NAME)
@@ -3564,10 +3596,7 @@ class DirectoryFileCache(FileCache):
                 f'due to present directories: {", ".join(dirs)}',
             )
 
-        for n in sorted(os.listdir(self.dir)):
-            if n.startswith('.'):
-                continue
-            fp = os.path.join(self.dir, n)
+        for fp in self._iter_dir_contents():
             check.state(os.path.isfile(fp))
             log.debug('Purging stale cache file: %s', fp)
             os.unlink(fp)
@@ -3579,6 +3608,42 @@ class DirectoryFileCache(FileCache):
 
     #
 
+    def purge(self, *, dry_run: bool = False) -> None:
+        purge_max_age_s = self._config.purge_max_age_s
+        purge_max_size_b = self._config.purge_max_size_b
+        if self._config.no_purge or (purge_max_age_s is None and purge_max_size_b is None):
+            return
+
+        self.setup_dir()
+
+        purge_min_mtime: ta.Optional[float] = None
+        if purge_max_age_s is not None:
+            purge_min_mtime = time.time() - purge_max_age_s
+
+        dct: ta.Dict[str, os.stat_result] = {}
+        for fp in self._iter_dir_contents():
+            check.state(os.path.isfile(fp))
+            dct[fp] = os.stat(fp)
+
+        total_size_b = 0
+        for fp, st in sorted(dct.items(), key=lambda t: -t[1].st_mtime):
+            total_size_b += st.st_size
+
+            purge = False
+            if purge_min_mtime is not None and st.st_mtime < purge_min_mtime:
+                purge = True
+            if purge_max_size_b is not None and total_size_b >= purge_max_size_b:
+                purge = True
+
+            if not purge:
+                continue
+
+            log.debug('Purging cache file: %s', fp)
+            if not dry_run:
+                os.unlink(fp)
+
+    #
+
     def get_cache_file_path(
             self,
             key: str,
@@ -3595,6 +3660,11 @@ class DirectoryFileCache(FileCache):
         cache_file_path = self.get_cache_file_path(key)
         if not os.path.exists(cache_file_path):
             return None
+
+        if not self._config.no_update_mtime:
+            stat_info = os.stat(cache_file_path)
+            os.utime(cache_file_path, (stat_info.st_atime, time.time()))
+
         return cache_file_path
 
     async def put_file(
@@ -4352,14 +4422,16 @@ def subprocess_maybe_shell_wrap_exec(*cmd: str) -> ta.Tuple[str, ...]:
 class GithubCache(FileCache, DataCache):
     @dc.dataclass(frozen=True)
     class Config:
-        dir: str
+        pass
 
     def __init__(
             self,
-            config: Config,
+            config: Config = Config(),
             *,
             client: ta.Optional[GithubCacheClient] = None,
             version: ta.Optional[CacheVersion] = None,
+
+            local: DirectoryFileCache,
     ) -> None:
         super().__init__(
             version=version,
@@ -4373,12 +4445,7 @@ class GithubCache(FileCache, DataCache):
             )
         self._client: GithubCacheClient = client
 
-        self._local = DirectoryFileCache(
-            DirectoryFileCache.Config(
-                dir=check.non_empty_str(config.dir),
-            ),
-            version=self._version,
-        )
+        self._local = local
 
     #
 
@@ -4677,20 +4744,11 @@ class BaseSubprocesses(abc.ABC):  # noqa
 ##
 
 
-def bind_github(
-        *,
-        cache_dir: ta.Optional[str] = None,
-) -> InjectorBindings:
-    lst: ta.List[InjectorBindingOrBindings] = []
-
-    if cache_dir is not None:
-        lst.extend([
-            inj.bind(GithubCache.Config(
-                dir=cache_dir,
-            )),
-            inj.bind(GithubCache, singleton=True),
-            inj.bind(FileCache, to_key=GithubCache),
-        ])
+def bind_github() -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        inj.bind(GithubCache, singleton=True),
+        inj.bind(FileCache, to_key=GithubCache),
+    ]
 
     return inj.as_bindings(*lst)
 
@@ -5912,9 +5970,9 @@ def bind_ci(
         *,
         config: Ci.Config,
 
-        github: bool = False,
+        directory_file_cache_config: ta.Optional[DirectoryFileCache.Config] = None,
 
-        cache_dir: ta.Optional[str] = None,
+        github: bool = False,
 ) -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [  # noqa
         inj.bind(config),
@@ -5933,21 +5991,16 @@ def bind_ci(
         ),
     ))
 
-    if cache_dir is not None:
-        if github:
-            lst.append(bind_github(
-                cache_dir=cache_dir,
-            ))
+    if directory_file_cache_config is not None:
+        lst.extend([
+            inj.bind(directory_file_cache_config),
+            inj.bind(DirectoryFileCache, singleton=True),
+        ])
 
+        if github:
+            lst.append(bind_github())
         else:
-            lst.extend([
-                inj.bind(DirectoryFileCache.Config(
-                    dir=cache_dir,
-                )),
-                inj.bind(DirectoryFileCache, singleton=True),
-                inj.bind(FileCache, to_key=DirectoryFileCache),
-
-            ])
+            lst.append(inj.bind(FileCache, to_key=DirectoryFileCache))
 
     return inj.as_bindings(*lst)
 
@@ -5992,6 +6045,9 @@ class CiCli(ArgparseCli):
 
     #
 
+    DEFAULT_PURGE_MAX_AGE_S = 60 * 60 * 24 * 30
+    DEFAULT_PURGE_MAX_SIZE_B = 1024 * 1024 * 1024 * 4
+
     @argparse_cmd(
         argparse_arg('project-dir'),
         argparse_arg('service'),
@@ -6001,6 +6057,8 @@ class CiCli(ArgparseCli):
 
         argparse_arg('--cache-dir'),
 
+        argparse_arg('--no-purge', action='store_true'),
+
         argparse_arg('--github', action='store_true'),
         argparse_arg('--github-detect', action='store_true'),
 
@@ -6124,17 +6182,32 @@ class CiCli(ArgparseCli):
             run_options=run_options,
         )
 
+        directory_file_cache_config: ta.Optional[DirectoryFileCache.Config] = None
+        if cache_dir is not None:
+            directory_file_cache_config = DirectoryFileCache.Config(
+                dir=cache_dir,
+
+                no_purge=bool(self.args.no_purge),
+
+                purge_max_age_s=self.DEFAULT_PURGE_MAX_AGE_S,
+                purge_max_size_b=self.DEFAULT_PURGE_MAX_SIZE_B,
+            )
+
         injector = inj.create_injector(bind_ci(
             config=config,
 
-            github=github,
+            directory_file_cache_config=directory_file_cache_config,
 
-            cache_dir=cache_dir,
+            github=github,
         ))
 
         async with injector[Ci] as ci:
             await ci.run()
 
+        if directory_file_cache_config is not None and not directory_file_cache_config.no_purge:
+            dfc = injector[DirectoryFileCache]
+            dfc.purge()
+
 
 async def _async_main() -> ta.Optional[int]:
     return await CiCli().async_cli_run()

omdev/scripts/interp.py

@@ -1340,7 +1340,7 @@ class Timeout(abc.ABC):
 
     @classmethod
     def _now(cls) -> float:
-        return time.time()
+        return time.monotonic()
 
     #
 

omdev/scripts/pyproject.py

@@ -2648,7 +2648,7 @@ class Timeout(abc.ABC):
 
     @classmethod
     def _now(cls) -> float:
-        return time.time()
+        return time.monotonic()
 
     #
 

omdev/tagstrings.py

@@ -21,7 +21,10 @@ TAG_STRING_VALUE_TYPES: ta.Tuple = (
 )
 
 
-TAG_STRING_BOOL_STR_MAP: ta.Mapping[str, bool] = {'true': True, 'false': False}
+TAG_STRING_BOOL_STR_MAP: ta.Mapping[str, bool] = {
+    'true': True,
+    'false': False,
+}
 
 
 def check_tag_string_string(s: str) -> str:
@@ -31,7 +34,9 @@ def check_tag_string_string(s: str) -> str:
     return s
 
 
-def build_hierarchy_tag_string_values(m: ta.Mapping[str, ta.Any]) -> ta.FrozenSet[HierarchyTagStringValue]:
+def build_hierarchy_tag_string_values(
+        m: ta.Mapping[str, ta.Any],
+) -> ta.FrozenSet[HierarchyTagStringValue]:
     def rec(c):
         if isinstance(c, str):
             yield (c,)
@@ -98,7 +103,10 @@ class TagString(ta.Generic[TagStringValueT]):
         return cls(
             name=name,
             type=bool,  # type: ignore
-            valid_values=frozenset(valid_values) if valid_values is not None else None,  # type: ignore
+            valid_values=(
+                frozenset(valid_values)  # type: ignore
+                if valid_values is not None else None
+            ),
             **kwargs,
         )
 
@@ -112,7 +120,10 @@ class TagString(ta.Generic[TagStringValueT]):
         return cls(
             name=name,
             type=str,  # type: ignore
-            valid_values=frozenset(check.not_isinstance(valid_values, str)) if valid_values is not None else None,  # type: ignore  # noqa
+            valid_values=(
+                frozenset(check.not_isinstance(valid_values, str))  # type: ignore
+                if valid_values is not None else None
+            ),
             **kwargs,
         )
 
@@ -126,7 +137,10 @@ class TagString(ta.Generic[TagStringValueT]):
         return cls(
             name=name,
             type=HierarchyTagStringValue,  # type: ignore
-            valid_values=build_hierarchy_tag_string_values(valid_values) if valid_values is not None else None,  # type: ignore  # noqa
+            valid_values=(
+                build_hierarchy_tag_string_values(valid_values)  # type: ignore
+                if valid_values is not None else None
+            ),
             **kwargs,
         )
 

{omdev-0.0.0.dev226.dist-info → omdev-0.0.0.dev228.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev226
+Version: 0.0.0.dev228
 Summary: omdev
 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: omlish==0.0.0.dev226
+Requires-Dist: omlish==0.0.0.dev228
 Provides-Extra: all
-Requires-Dist: black~=24.10; extra == "all"
+Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"
@@ -24,9 +24,9 @@ Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: gprof2dot~=2024.6; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: wheel~=0.44; extra == "all"
+Requires-Dist: wheel~=0.45; extra == "all"
 Provides-Extra: black
-Requires-Dist: black~=24.10; extra == "black"
+Requires-Dist: black~=25.1; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
@@ -43,4 +43,4 @@ Requires-Dist: prompt-toolkit~=3.0; extra == "ptk"
 Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: wheel
-Requires-Dist: wheel~=0.44; extra == "wheel"
+Requires-Dist: wheel~=0.45; extra == "wheel"

{omdev-0.0.0.dev226.dist-info → omdev-0.0.0.dev228.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omdev/.manifests.json,sha256=02pFpcoefn9JQr0AIqt_6-BnWi49KF0baoGEKv8bjn0,9093
-omdev/__about__.py,sha256=j3vFclhFvyPICV6FK4aDApFzMCqJWxv9FaWwdwXrSgw,1215
+omdev/__about__.py,sha256=Iect_SBD2EXgx7QcFGiOqTHkOWD-bWOyvzgReDOY4Es,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
@@ -9,7 +9,7 @@ omdev/imgur.py,sha256=h38w1a1hFYAysfmD4uYXZo1yMj0NKzWgdQmedVSHnTc,3000
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=0feRWC0Uttd6K9cCImAHEXoo6-Nuso3tpaHUuhzBlRQ,4985
 omdev/secrets.py,sha256=aC1o2vJtdLpa_MJoO2P2wty1pfqgAPytj54CamLLFWw,544
-omdev/tagstrings.py,sha256=hrinoRmYCFMt4WYCZAYrocVYKQvIApNGKbJaGz8whqs,5334
+omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
@@ -71,12 +71,12 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/ci/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/ci/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
-omdev/ci/cache.py,sha256=ohgWIbefNNbqwFLzpdDzqWabogwXZugfJ2AL64U3xsw,6578
+omdev/ci/cache.py,sha256=K3SirapVPEGcdq2_G1DeLc0hxweTPeer9DH3LlZZK8w,8350
 omdev/ci/ci.py,sha256=JNFDs3sYCs93NOrnQxKiZNVnOotOwOL1CIEB4TL--Fg,6342
-omdev/ci/cli.py,sha256=URmYwsvNSb4w_kwluLB4Em4ooTpiLG4Bh8Anjx0IVIE,6013
+omdev/ci/cli.py,sha256=CgFxNllLCn-hgVsq3w_RCBb3j3jjacZVtkFNQXxgBmE,6828
 omdev/ci/compose.py,sha256=vHLuXO5e2paafBC0Kf-OUGoamtIJmQ19r2U3_oikk_g,4541
 omdev/ci/consts.py,sha256=1puYfksvGOaVWEnbARM_sdMqs8oTn_VvsevsOtLsFno,21
-omdev/ci/inject.py,sha256=ZZWaT_GT4SE_lO8st2Y2IjKmeAtL3LD7KjEVr-E6Zzo,1514
+omdev/ci/inject.py,sha256=xo3AkobJKLLE7ZTa084NeGZm8pCABh4Wmh-RLRHFjTs,1460
 omdev/ci/requirements.py,sha256=UKN6avU5V96YmmJL8XYvMPxzzOagrKpGTYadaxI2z9U,2105
 omdev/ci/shell.py,sha256=cBPLMKiAJuNpPGj3ou6hpl88Xw7r99xpL91KJBQ0rqw,835
 omdev/ci/utils.py,sha256=YxOT4S-YLDOAv27K0Q0SKzxncZrWFA_wNXlFOaJmQuI,304
@@ -94,11 +94,11 @@ omdev/ci/docker/utils.py,sha256=URioGRzqyqdJBZyOfzsrUwv5hSJ3WM23_sLHES9vamc,1129
 omdev/ci/github/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ci/github/api.py,sha256=Vqza7Hm1OCSfZYgdXF4exkjneqNjFcdO1pl8qmODskU,5198
 omdev/ci/github/bootstrap.py,sha256=9OuftAz7CUd7uf2Or3sJFVozQQiwu0RGAlTOQNpLQIY,430
-omdev/ci/github/cache.py,sha256=39n0H4KpRCryQeIGVJqL6coyg7q4IFpFZZyBkbOo6PM,2672
+omdev/ci/github/cache.py,sha256=n0nuEaGidvXBfB1ZU1G2Khp5Wuztoh_uNjPkny8KDdQ,2553
 omdev/ci/github/cli.py,sha256=6mG0CllwrOoC7MDzKfKDqBHAjfF0gEI6aT5UAGMmuss,1114
 omdev/ci/github/client.py,sha256=fT8rQ5RO5MXyjpIt6UEFR7escofkBau73m8KYMzcZFo,14614
 omdev/ci/github/env.py,sha256=FQFjP_m7JWM7es9I51U-6UgJTwAt_UCVHFIYKTd9NKM,394
-omdev/ci/github/inject.py,sha256=FnmAL9vcZSYKvbuNjYDYlrc-XiFPayR806pYUd4Dyao,689
+omdev/ci/github/inject.py,sha256=Dwm2-qujyIqKYpBhiuebV3Lg5Gzf_cqk13NFVbf-8PQ,479
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
@@ -206,12 +206,12 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/ci.py,sha256=IZYSToZ9UyNZKiyOnbrk7pfuJhlyamMLmkQX6nwYKP8,159949
+omdev/scripts/ci.py,sha256=sZeKGLX3XsmhL7n02npohUpE3Z3MWe03AkhZAh5mU94,162353
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=AYxF2dftxs1anS211-qWmJKzw_B_HIbZIyP6OC5eFdY,150405
-omdev/scripts/pyproject.py,sha256=D8GgeTEOC8pKEwUX8whjOPuMGsYGRRKA8nIzXOAli_Y,258078
+omdev/scripts/interp.py,sha256=hKBiphk6k9g2QVkPbEYDmdAeCQCDmhv98u5qfvAFlcA,150410
+omdev/scripts/pyproject.py,sha256=qC1HifBvYyDOj_Caw6B7AvklgYcdtLhejVtA6V2yDYk,258083
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -243,9 +243,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev226.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev226.dist-info/METADATA,sha256=XK1jVJw9D5_tEULYgkiKcbQYJBjQJE0QVddRh7NsU4c,1638
-omdev-0.0.0.dev226.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev226.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev226.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev226.dist-info/RECORD,,
+omdev-0.0.0.dev228.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev228.dist-info/METADATA,sha256=F21kNK_t2VCTGzAd_c0dW2mXJ1zKvOPizv8l2cwnV4s,1636
+omdev-0.0.0.dev228.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev228.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev228.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev228.dist-info/RECORD,,