omdev 0.0.0.dev416__py3-none-any.whl → 0.0.0.dev500__py3-none-any.whl

omdev/cexts/_distutils/compilers/unixccompiler.py

@@ -14,13 +14,14 @@ from __future__ import annotations
 
 import importlib
 import itertools
-import logging
 import os
 import re
 import shlex
 import sys
 import typing as ta
 
+from omlish.logs import all as logs
+
 from .. import sysconfig
 from ..errors import CompileError
 from ..errors import DistutilsExecError
@@ -32,7 +33,10 @@ from .options import gen_lib_options
 from .options import gen_preprocess_options
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def bypass_compiler_fixup(cmd, args):

omdev/cexts/_distutils/dir_util.py

@@ -1,13 +1,17 @@
 """Utility functions for manipulating directories and directory trees."""
 import errno
-import logging
 import os
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsFileError
 from .errors import DistutilsInternalError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 # cache for by mkpath() -- in addition to cheapening redundant calls, eliminates redundant "creating /foo/bar/baz"

omdev/cexts/_distutils/errors.py

@@ -8,6 +8,9 @@ end with "Error".
 """
 
 
+##
+
+
 class DistutilsError(Exception):
     """The root of all Distutils evil."""
 

omdev/cexts/_distutils/extension.py

@@ -2,6 +2,9 @@
 import warnings
 
 
+##
+
+
 class Extension:
     """
     Just a collection of attributes that describes an extension module and everything needed to build it (hopefully in a

omdev/cexts/_distutils/file_util.py

@@ -1,12 +1,16 @@
 """Utility functions for operating on single files."""
 import contextlib
-import logging
 import os
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsFileError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 # for generating verbose output in 'copy_file()'

omdev/cexts/_distutils/modified.py

@@ -4,6 +4,9 @@ import os.path
 from .errors import DistutilsFileError
 
 
+##
+
+
 def _newer(source, target):
     return not os.path.exists(target) or (os.path.getmtime(source) > os.path.getmtime(target))
 

omdev/cexts/_distutils/spawn.py

@@ -4,15 +4,19 @@ specific functions for launching another program in a sub-process.
 Also provides the 'find_executable()' to search the path for a given
 executable name.
 """
-import logging
 import os
 import subprocess
 import sys
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsExecError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def spawn(cmd, search_path=1, verbose=0, dry_run=False, env=None, debug=False):  # noqa: C901

omdev/cexts/_distutils/sysconfig.py

@@ -16,6 +16,9 @@ from .errors import DistutilsPlatformError
 from .util import pass_none
 
 
+##
+
+
 IS_PYPY = '__pypy__' in sys.builtin_module_names
 
 # These are needed in a couple of spots, so just compute them once.

omdev/cexts/_distutils/util.py

@@ -1,6 +1,5 @@
 """Miscellaneous utility functions -- anything that doesn't fit into one of the other *util.py modules."""
 import functools
-import logging
 import os
 import re
 import string
@@ -8,10 +7,15 @@ import sys
 import sysconfig
 import typing as ta
 
+from omlish.logs import all as logs
+
 from .errors import DistutilsPlatformError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def pass_none(func):

omdev/cexts/_distutils/version.py

@@ -18,6 +18,9 @@ import re
 import warnings
 
 
+##
+
+
 @contextlib.contextmanager
 def suppress_known_deprecation():
     with warnings.catch_warnings(record=True) as ctx:

omdev/cexts/cmake.py

@@ -33,7 +33,6 @@ Done:
 import argparse
 import dataclasses as dc
 import io
-import logging
 import os.path
 import shutil
 import sys
@@ -50,7 +49,7 @@ from ..cli import CliModule
 from .magic import CextMagic
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -267,7 +266,10 @@ class CmakeProjectGen:
                         '-g',
                         '-c',
                     ],
-                    ['-std=c++20'],
+                    [
+                        '$<$<COMPILE_LANGUAGE:C>:-std=c11>',
+                        '$<$<COMPILE_LANGUAGE:CXX>:-std=c++20>',
+                    ],
                 ),
             ))
 

omdev/cexts/scan.py

@@ -1,5 +1,4 @@
 import argparse
-import logging
 import os.path
 import typing as ta
 
@@ -8,7 +7,7 @@ from omlish.logs import all as logs
 from .magic import CextMagic
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/ci/cache.py

@@ -15,9 +15,10 @@ import time
 import typing as ta
 import urllib.request
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.os.temp import make_temp_file
 
 from .consts import CI_CACHE_VERSION
@@ -26,10 +27,13 @@ from .consts import CI_CACHE_VERSION
 CacheVersion = ta.NewType('CacheVersion', int)
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
-class FileCache(abc.ABC):
+class FileCache(Abstract):
     DEFAULT_CACHE_VERSION: ta.ClassVar[CacheVersion] = CacheVersion(CI_CACHE_VERSION)
 
     def __init__(
@@ -229,7 +233,7 @@ class DirectoryFileCache(FileCache):
 
 class DataCache:
     @dc.dataclass(frozen=True)
-    class Data(abc.ABC):  # noqa
+    class Data(Abstract):
         pass
 
     @dc.dataclass(frozen=True)

omdev/ci/cli.py

@@ -14,7 +14,6 @@ import argparse
 import asyncio
 import itertools
 import os.path
-import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
@@ -22,8 +21,8 @@ from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_cmd
 from omlish.lite.check import check
 from omlish.lite.inject import inj
-from omlish.lite.logs import log
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.modules import get_module_logger
+from omlish.logs.std.standard import configure_standard_logging
 
 from .cache import DirectoryFileCache
 from .ci import Ci
@@ -35,6 +34,9 @@ from .requirements import build_requirements_hash
 from .shell import ShellCmd
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -257,7 +259,7 @@ async def _async_main() -> ta.Optional[int]:
 def _main() -> None:
     configure_standard_logging('DEBUG')
 
-    sys.exit(rc if isinstance(rc := asyncio.run(_async_main()), int) else 0)
+    raise SystemExit(rc if isinstance(rc := asyncio.run(_async_main()), int) else 0)
 
 
 if __name__ == '__main__':

omdev/ci/docker/buildcaching.py

@@ -3,6 +3,8 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
+
 from .cache import DockerCache
 from .cache import DockerCacheKey
 from .cmds import is_docker_image_present
@@ -12,7 +14,7 @@ from .cmds import tag_docker_image
 ##
 
 
-class DockerBuildCaching(abc.ABC):
+class DockerBuildCaching(Abstract):
     @abc.abstractmethod
     def cached_build_docker_image(
             self,

omdev/ci/docker/cache.py

@@ -3,6 +3,7 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.os.temp import temp_file_context
 
@@ -35,7 +36,7 @@ class DockerCacheKey:
 ##
 
 
-class DockerCache(abc.ABC):
+class DockerCache(Abstract):
     @abc.abstractmethod
     def load_cache_docker_image(self, key: DockerCacheKey) -> ta.Awaitable[ta.Optional[str]]:
         raise NotImplementedError

omdev/ci/docker/cacheserved/cache.py

@@ -10,11 +10,11 @@ from omlish.asyncs.asyncio.sockets import asyncio_wait_until_can_connect
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 from omlish.lite.json import json_dumps_compact
-from omlish.lite.logs import log
 from omlish.lite.marshal import marshal_obj
 from omlish.lite.marshal import unmarshal_obj
 from omlish.lite.timeouts import Timeout
 from omlish.lite.timeouts import TimeoutLike
+from omlish.logs.modules import get_module_logger
 
 from ....dataserver.server import DataServer
 from ....dataserver.targets import DataServerTarget
@@ -35,6 +35,9 @@ from .manifests import build_cache_served_docker_image_data_server_routes
 from .manifests import build_cache_served_docker_image_manifest
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/docker/cacheserved/manifests.py

@@ -1,9 +1,9 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import dataclasses as dc
 import os.path
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 from ....dataserver.routes import DataServerRoute
@@ -25,7 +25,7 @@ class CacheServedDockerImageManifest:
         content_length: int
 
         @dc.dataclass(frozen=True)
-        class Target(abc.ABC):  # noqa
+        class Target(Abstract):
             pass
 
         @dc.dataclass(frozen=True)

omdev/ci/docker/dataserver.py

@@ -1,7 +1,6 @@
 # ruff: noqa: UP006 UP007 UP043 UP045
 import asyncio
 import contextlib
-import logging
 import ssl
 import sys
 import threading
@@ -14,6 +13,7 @@ from omlish.http.handlers import LoggingHttpHandler
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import AsyncExitStacked
+from omlish.logs.protocols import LoggerLike
 from omlish.secrets.tempssl import generate_temp_localhost_ssl_cert
 from omlish.sockets.server.server import SocketServer
 
@@ -145,7 +145,7 @@ class DockerDataServer(AsyncExitStacked):
             port: int,
             data_server: DataServer,
             *,
-            handler_log: ta.Optional[logging.Logger] = None,
+            handler_log: ta.Optional[LoggerLike] = None,
             stop_event: ta.Optional[asyncio.Event] = None,
     ) -> None:
         super().__init__()

omdev/ci/docker/imagepulling.py

@@ -3,6 +3,7 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.timing import log_timing_context
 from omlish.text.mangle import StringMangler
 
@@ -16,7 +17,7 @@ from .cmds import pull_docker_image
 ##
 
 
-class DockerImagePulling(abc.ABC):
+class DockerImagePulling(Abstract):
     @abc.abstractmethod
     def pull_docker_image(self, image: str) -> ta.Awaitable[None]:
         raise NotImplementedError

omdev/ci/docker/packing.py

@@ -8,7 +8,7 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import async_cached_nullary
 from omlish.lite.cached import cached_nullary
 from omlish.lite.contextmanagers import ExitStacked
-from omlish.logs.timing import log_timing_context
+from omlish.logs.utils import log_timing_context
 from omlish.os.temp import temp_dir_context
 
 from ...oci.building import BuiltOciImageIndexRepository

omdev/ci/docker/repositories.py

@@ -5,6 +5,7 @@ import shlex
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.abstract import Abstract
 from omlish.lite.timing import log_timing_context
 from omlish.os.temp import temp_dir_context
 
@@ -15,7 +16,7 @@ from ...oci.repositories import OciRepository
 ##
 
 
-class DockerImageRepositoryOpener(abc.ABC):
+class DockerImageRepositoryOpener(Abstract):
     @abc.abstractmethod
     def open_docker_image_repository(self, image: str) -> ta.AsyncContextManager[OciRepository]:
         raise NotImplementedError

omdev/ci/github/api/clients.py

@@ -12,21 +12,25 @@ import urllib.request
 
 from omlish.asyncs.asyncio.utils import asyncio_wait_concurrent
 from omlish.http.urllib import NonRaisingUrllibErrorProcessor
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.json import json_dumps_compact
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...consts import CI_CACHE_VERSION
 from ..env import register_github_env_var
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
-class GithubCacheClient(abc.ABC):
+class GithubCacheClient(Abstract):
     @dc.dataclass(frozen=True)
-    class Entry(abc.ABC):  # noqa
+    class Entry(Abstract):
         pass
 
     @abc.abstractmethod
@@ -48,7 +52,7 @@ class GithubCacheClient(abc.ABC):
 ##
 
 
-class BaseGithubCacheClient(GithubCacheClient, abc.ABC):
+class BaseGithubCacheClient(GithubCacheClient, Abstract):
     AUTH_TOKEN_ENV_VAR = register_github_env_var('ACTIONS_RUNTIME_TOKEN')  # noqa
 
     KEY_SUFFIX_ENV_VAR = register_github_env_var('GITHUB_RUN_ID')

omdev/ci/github/api/v1/client.py

@@ -6,8 +6,8 @@ import urllib.parse
 import urllib.request
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...env import register_github_env_var
 from ..clients import BaseGithubCacheClient
@@ -15,6 +15,9 @@ from ..clients import GithubCacheClient
 from .api import GithubCacheServiceV1
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/ci/github/api/v2/api.py

@@ -90,6 +90,7 @@ class GithubCacheServiceV2:
     class CreateCacheEntryResponse:
         ok: bool
         signed_upload_url: str
+        message: ta.Optional[str] = None
 
     CREATE_CACHE_ENTRY_METHOD: Method[
         CreateCacheEntryRequest,
@@ -113,6 +114,7 @@ class GithubCacheServiceV2:
     class FinalizeCacheEntryUploadResponse:
         ok: bool
         entry_id: str
+        message: ta.Optional[str] = None
 
     FINALIZE_CACHE_ENTRY_METHOD: Method[
         FinalizeCacheEntryUploadRequest,

omdev/ci/github/api/v2/azure.py

@@ -13,8 +13,11 @@ import xml.etree.ElementTree as ET
 
 from omlish.asyncs.asyncio.utils import asyncio_wait_concurrent
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##

omdev/ci/github/api/v2/client.py

@@ -5,8 +5,8 @@ import typing as ta
 import urllib.request
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
 from omlish.lite.timing import log_timing_context
+from omlish.logs.modules import get_module_logger
 
 from ...env import register_github_env_var
 from ..clients import BaseGithubCacheClient
@@ -17,6 +17,9 @@ from .api import GithubCacheServiceV2ResponseT
 from .azure import AzureBlockBlobUploader
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

omdev/cli/clicli.py

@@ -1,9 +1,11 @@
+import dataclasses as dc
 import inspect
 import os
 import re
 import shlex
 import subprocess
 import sys
+import time
 import typing as ta
 import urllib.parse
 import urllib.request
@@ -13,6 +15,7 @@ from omlish import lang
 from omlish.argparse import all as ap
 from omlish.os.temp import temp_dir_context
 
+from ..packaging.versions import Version
 from ..pip import get_root_dists
 from ..pip import lookup_latest_package_version
 from . import install
@@ -87,22 +90,49 @@ class CliCli(ap.Cli):
 
     #
 
+    @dc.dataclass()
+    class ReinstallWouldNotUpgradeError(Exception):
+        current_version: str
+        target_version: str
+
+        def __str__(self) -> str:
+            return f'Current version {self.current_version} is not older than target version {self.target_version} '
+
     @ap.cmd(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
         ap.arg('--no-uv', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
+        ap.arg('--must-upgrade', action='store_true'),
+        ap.arg('--must-upgrade-loop', action='store_true'),
         ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
-        latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
-
-        if self.args.version is not None:
-            target_version: str = self.args.version
-        else:
-            target_version = latest_version
+        current_version = __about__.__version__
+
+        while True:
+            latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
+
+            if self.args.version is not None:
+                target_version: str = self.args.version
+            else:
+                target_version = latest_version
+
+            if self.args.must_upgrade or self.args.must_upgrade_loop:
+                current_vo = Version(current_version)
+                target_vo = Version(target_version)
+                if not (target_vo > current_vo):
+                    ex = CliCli.ReinstallWouldNotUpgradeError(current_version, target_version)
+                    if self.args.must_upgrade_loop:
+                        print(ex)
+                        time.sleep(1)
+                        continue
+                    else:
+                        raise ex
+
+            break
 
         #
 
@@ -186,7 +216,7 @@ class CliCli(ap.Cli):
 
         #
 
-        print(f'Current version: {__about__.__version__}')
+        print(f'Current version: {current_version}')
         print(f'Latest version: {latest_version}')
         print(f'Target version: {target_version}')
         print()

omdev/clipboard/clipboard.py

@@ -29,7 +29,7 @@ class ImageClipboardContents(ClipboardContents):
 ##
 
 
-class Clipboard(abc.ABC):
+class Clipboard(lang.Abstract):
     @abc.abstractmethod
     def get(self) -> list[ClipboardContents]:
         raise NotImplementedError

omdev/cmake.py

@@ -2,6 +2,7 @@ import abc
 import typing as ta
 
 from omlish import dataclasses as dc
+from omlish import lang
 
 
 ##
@@ -21,7 +22,7 @@ class Var:
 
 
 @dc.dataclass(frozen=True)
-class Target(abc.ABC):
+class Target(lang.Abstract):
     name: str
     src_files: ta.Sequence[str]
 

omdev/cmdlog/cli.py

@@ -1,7 +1,6 @@
 import argparse
 import os.path
 import subprocess
-import sys
 import typing as ta
 
 from omlish.formats import json
@@ -60,7 +59,7 @@ def _main() -> None:
             entry_dcts = [json.loads(sl) for l in log_lines if (sl := l.strip())]
             print(json.dumps_compact(entry_dcts))
 
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 
 if __name__ == '__main__':