omdev 0.0.0.dev299__tar.gz → 0.0.0.dev301__tar.gz

{omdev-0.0.0.dev299/omdev.egg-info → omdev-0.0.0.dev301}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev299
+Version: 0.0.0.dev301
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev299
+Requires-Dist: omlish==0.0.0.dev301
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

omdev-0.0.0.dev301/README.md

@@ -0,0 +1,17 @@
+# Overview
+
+Development utilities and support code.
+
+# Notable packages
+
+- **[cli](cli)** - The codebase's all-in-one CLI. This is not installed as an entrypoint / command when this package is
+  itself installed - that is separated into the `omdev-cli` installable package so as to not pollute users' bin/
+  directories when depping this lib for its utility code.
+
+- **[amalg](amalg)** - The [amalgamator](#amalgamation).
+
+# Amalgamation
+
+Amalgamation is the process of stitching together multiple python source files into a single self-contained python
+script. ['lite'](https://github.com/wrmsr/omlish/blob/master/omlish#lite-code) code is written in a style conducive to
+this.

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 173,
+    "line": 176,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/cc/cdeps.py

@@ -5,7 +5,7 @@ import typing as ta
 from omlish import cached
 from omlish import lang
 from omlish import marshal as msh
-from omlish.configs import all as configs
+from omlish.configs import all as cfgs
 
 
 @dc.dataclass(frozen=True)
@@ -45,7 +45,7 @@ class Cdep:
 
 
 def process_marshaled_cdep(obj: ta.Any) -> ta.Any:
-    obj = configs.processing.matched_rewrite(
+    obj = cfgs.processing.matched_rewrite(
         lambda s: s if isinstance(s, str) else ''.join(s),
         obj,
         ('sources', None),

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/cli/_pathhack.py

@@ -16,6 +16,9 @@ import site
 import sys
 
 
+##
+
+
 class _PathHackMetaFinder:
     def __init__(
             self,

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/cli/clicli.py

@@ -17,6 +17,9 @@ from . import install
 from .types import CliModule
 
 
+##
+
+
 DEFAULT_REINSTALL_URL = 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py'
 
 

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/cli/install.py

@@ -2,7 +2,7 @@
 # @omlish-lite
 # @omlish-script
 """
-curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
+curl -LsSf 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py' | python3 -
 """
 import abc
 import argparse
@@ -15,6 +15,9 @@ import sys
 import typing as ta
 
 
+##
+
+
 DEFAULT_CLI_PKG = 'omdev-cli'
 DEFAULT_PY_VER = '3.12'
 

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/cli/types.py

@@ -3,6 +3,9 @@ import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class CliCmd:
     cmd_name: ta.Union[str, ta.Sequence[str]]

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/pyproject/pkg.py

@@ -184,8 +184,14 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
     def _symlink_standard_files(self) -> None:
         for fn in self._STANDARD_FILES:
-            if os.path.exists(fn):
-                os.symlink(os.path.relpath(fn, self._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+            for tp in [
+                [self._pkg_dir(), self._dir_name],
+                [],
+            ]:
+                fp = os.path.join(*tp, fn)
+                if os.path.exists(fp):
+                    os.symlink(os.path.relpath(fp, self._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+                    break
 
     #
 

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/scripts/ci.py

@@ -11436,7 +11436,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
         async with self.popen(*run.cmd, **kwargs) as proc:
             stdout, stderr = await self.communicate(proc, run.input, run.timeout)
 
-        if check and proc.returncode:
+        if run.check and proc.returncode:
             raise subprocess.CalledProcessError(
                 proc.returncode,
                 run.cmd,

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/scripts/interp.py

@@ -4610,7 +4610,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
         async with self.popen(*run.cmd, **kwargs) as proc:
             stdout, stderr = await self.communicate(proc, run.input, run.timeout)
 
-        if check and proc.returncode:
+        if run.check and proc.returncode:
             raise subprocess.CalledProcessError(
                 proc.returncode,
                 run.cmd,

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev/scripts/pyproject.py

@@ -949,6 +949,7 @@ class TomlDecodeError(ValueError):
 
 def toml_load(fp: ta.BinaryIO, /, *, parse_float: TomlParseFloat = float) -> ta.Dict[str, ta.Any]:
     """Parse TOML from a binary file object."""
+
     b = fp.read()
     try:
         s = b.decode()
@@ -7063,7 +7064,7 @@ class AsyncioSubprocesses(AbstractAsyncSubprocesses):
         async with self.popen(*run.cmd, **kwargs) as proc:
             stdout, stderr = await self.communicate(proc, run.input, run.timeout)
 
-        if check and proc.returncode:
+        if run.check and proc.returncode:
             raise subprocess.CalledProcessError(
                 proc.returncode,
                 run.cmd,
@@ -7982,8 +7983,14 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
     def _symlink_standard_files(self) -> None:
         for fn in self._STANDARD_FILES:
-            if os.path.exists(fn):
-                os.symlink(os.path.relpath(fn, self._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+            for tp in [
+                [self._pkg_dir(), self._dir_name],
+                [],
+            ]:
+                fp = os.path.join(*tp, fn)
+                if os.path.exists(fp):
+                    os.symlink(os.path.relpath(fp, self._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+                    break
 
     #
 

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev299
+Version: 0.0.0.dev301
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev299
+Requires-Dist: omlish==0.0.0.dev301
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev299 → omdev-0.0.0.dev301}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev299
+omlish==0.0.0.dev301
 
 [all]
 black~=25.1

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

omdev-0.0.0.dev299/README.md

@@ -1,31 +0,0 @@
-It's like my previous python monorepo-ey thing [`omnibus`](https://github.com/wrmsr/omnibus/tree/wrmsr_exp_split)... ish.
-
-Core packages begin with `om`, scratch app is in `app`, temp / dump code is in `x`.
-
-----
-
-The core packages are:
-
-- **omlish**: core foundational code
-- **omdev**: development utilities
-- **omserv**: production web server
-- **ominfra**: infrastructure and cloud code
-- **ommlx**: ml / ai code
-
-----
-
-Core packages installable from pypi, or from git via:
-
-```bash
-pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
-```
-
-Core packages have no required dependencies, but numerous optional ones - see their respective `pyproject.toml` files for details.
-
-The CLI is installable through uvx or pipx via:
-
-```bash
-curl -LsSf 'https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py' | python3 -
-```
-
-Additional deps to be injected may be appended to the command.