omdev 0.0.0.dev299__py3-none-any.whl → 0.0.0.dev301__py3-none-any.whl

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/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/cli/_pathhack.py

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

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/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/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/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/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/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/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.dist-info → omdev-0.0.0.dev301.dist-info}/METADATA

@@ -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.dist-info → omdev-0.0.0.dev301.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=dGVYrnJAvQf447hWZwk5SO7-PdQh0XH_sDs7eX4CAds,10721
+omdev/.manifests.json,sha256=bjE9Iw6Zx6fqBBkH-mTcTLze6jxh126JRSBxdMVPQjU,10721
 omdev/__about__.py,sha256=16xa_1BdZanTpZbkjAOQ11_x5kJcb1m1tKdvb06J7VI,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -37,7 +37,7 @@ omdev/cache/data/manifests.py,sha256=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco
 omdev/cache/data/specs.py,sha256=u082monskfaHeJlDXOAXjyvgRfqrnbVXrFLMJoOHWqI,2470
 omdev/cc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cc/__main__.py,sha256=n7gxSRYZ1QZOUxQPCT0_n9Xl26zi2UIvCwyGW_m67nA,166
-omdev/cc/cdeps.py,sha256=vU0_O822uG8KK2lizuY71YczH9N9KB2JdI492JnGGQ0,1552
+omdev/cc/cdeps.py,sha256=33_XLbLZMptyJIkzas6ruSHsaNi95pRQj5BNQInG75o,1546
 omdev/cc/cdeps.toml,sha256=MqZ1OQHQ2JPvQpHRL32GpRgQWQRtzjPI2EWl4EqSm-I,1004
 omdev/cc/cli.py,sha256=B_JmY2hFfWaCc7IpISmcbMTWuzGN4xtpHkzaGLQIkL0,4412
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -104,12 +104,12 @@ omdev/ci/github/api/v2/azure.py,sha256=N2Z1525WMCAyYSfDqICneRT6itwkAoX3_qp8OlE-j
 omdev/ci/github/api/v2/client.py,sha256=scY_Nmzt6wKjFt_YjTq0CjBHArV8DnLQeLlxlpShOOI,6348
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
-omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=KWDQl1tsJctk-3AOWOf7IP2b4khoUhb0kyfrj3Df5VU,4476
-omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
+omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
+omdev/cli/clicli.py,sha256=LuOdHYh_YFULDxZCX6X0sB6JFpu6ogntVtN4WdT0o3Q,4481
+omdev/cli/install.py,sha256=Vy2-Qxgjua_80KLOAa7cUNn-WxtG7ebAmlkHfSTXkFM,4467
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
-omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
+omdev/cli/types.py,sha256=_aFoUxSOQX_RzRiauy0UNfnUqVXuea9WtWSCGkHtJuw,479
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/clipboard/clipboard.py,sha256=9HFpcijpn0XDTI89ZRm2WA1G7O4HsTdVXZHqMULu3N0,1630
 omdev/clipboard/darwin_cf.py,sha256=1gFkxEN6w9HTcA0eiWw14oL7xjC1wSmY_hUrRr5OU4Y,7687
@@ -231,16 +231,16 @@ omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
 omdev/pyproject/cli.py,sha256=Jp3OTevYndvtid2fr-Q7rWza29GnLexotmf19JJcX-o,8743
 omdev/pyproject/configs.py,sha256=HEo90bPUAo6CBnBHZFDYohlwiRD-4cxZCYR6oXv-5lQ,2802
 omdev/pyproject/inject.py,sha256=PgZnfWGoqjHsaHLUEPJaQW_66h1LRuSm8Njl--KDzOw,314
-omdev/pyproject/pkg.py,sha256=evhx3W7Os4V8y4cugp5-6KhmVe2-mxRel-IgrMZZoHQ,14657
+omdev/pyproject/pkg.py,sha256=0h1UKKywuO3fjqyV-zIdQq-z3bVDtIYJoSRl1T5kKOA,14844
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
 omdev/pyproject/venvs.py,sha256=GUurjC7qzGlFL-su4C0YPO_pxbwDAyl1CqyLOB3WLCA,1911
 omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=Yn2-t6f2mu6f8wMzFyQrg2aRizfP2p42VkGgFesaMa0,353283
-omdev/scripts/interp.py,sha256=S2WRMSm75MDMZaJQiHqjmWJFt5LTujFE_lFHCQCsk8w,151816
-omdev/scripts/pyproject.py,sha256=alHl9jCosMFVGWyYYdLGAC0U8J00iEgNgASo4Od09Ag,260967
+omdev/scripts/ci.py,sha256=qTqXdGd0T1Lp4OfVm8dO080seeeYTubD6QBYr_3EQI8,353287
+omdev/scripts/interp.py,sha256=EnXhNiIPrVq-NlSeNPOQik8xTetB2i-d92U8_OpmTxg,151820
+omdev/scripts/pyproject.py,sha256=GOUqmpbb4XuYhBp2GmkI-P92lC7CsYYfC277hyE4CTk,261159
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -277,9 +277,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.dev299.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev299.dist-info/METADATA,sha256=TGyXbGykZp69Bj_8aGIpVWcS4UVrjH8wp0GnfazF-20,1674
-omdev-0.0.0.dev299.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omdev-0.0.0.dev299.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev299.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev299.dist-info/RECORD,,
+omdev-0.0.0.dev301.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev301.dist-info/METADATA,sha256=RTtM2hskW9-UBits6U6nanzEeFrc3qsHOVDuruRi-vA,1674
+omdev-0.0.0.dev301.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+omdev-0.0.0.dev301.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev301.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev301.dist-info/RECORD,,

{omdev-0.0.0.dev299.dist-info → omdev-0.0.0.dev301.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any