omdev 0.0.0.dev215__tar.gz → 0.0.0.dev216__tar.gz

{omdev-0.0.0.dev215/omdev.egg-info → omdev-0.0.0.dev216}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev215
+Version: 0.0.0.dev216
 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.dev215
+Requires-Dist: omlish==0.0.0.dev216
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216}/omdev/scripts/ci.py

@@ -167,7 +167,7 @@ def asyncio_once(fn: CallableT) -> CallableT:
     return ta.cast(CallableT, inner)
 
 
-def drain_tasks(loop=None):
+def drain_asyncio_tasks(loop=None):
     if loop is None:
         loop = asyncio.get_running_loop()
 
@@ -182,7 +182,7 @@ def draining_asyncio_tasks() -> ta.Iterator[None]:
         yield
     finally:
         if loop is not None:
-            drain_tasks(loop)  # noqa
+            drain_asyncio_tasks(loop)  # noqa
 
 
 async def asyncio_wait_concurrent(
@@ -2563,7 +2563,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216}/omdev/scripts/interp.py

@@ -3500,7 +3500,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216}/omdev/scripts/pyproject.py

@@ -5740,7 +5740,7 @@ TODO:
 
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
-    ('process', 'pid=%(process)-6s'),
+    ('process', 'pid=%(process)s'),
     ('thread', 'tid=%(thread)x'),
     ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216}/omdev/tools/json/formats.py

@@ -18,6 +18,7 @@ if ta.TYPE_CHECKING:
     import yaml
 
     from omlish.formats import dotenv
+    from omlish.formats import json5
     from omlish.formats import props
     from omlish.formats import xml
 
@@ -29,6 +30,7 @@ else:
     yaml = lang.proxy_import('yaml')
 
     dotenv = lang.proxy_import('omlish.formats.dotenv')
+    json5 = lang.proxy_import('omlish.formats.json5')
     props = lang.proxy_import('omlish.formats.props')
     xml = lang.proxy_import('omlish.formats.xml')
 
@@ -45,6 +47,8 @@ class Format:
 class Formats(enum.Enum):
     JSON = Format(['json'], json.load)
 
+    JSON5 = Format(['json5'], lambda f: json5.loads(f.read()))
+
     YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
 
     TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev215
+Version: 0.0.0.dev216
 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.dev215
+Requires-Dist: omlish==0.0.0.dev216
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev215 → omdev-0.0.0.dev216}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev215
+omlish==0.0.0.dev216
 
 [all]
 black~=24.10

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