omdev 0.0.0.dev51__tar.gz → 0.0.0.dev52__tar.gz

{omdev-0.0.0.dev51/omdev.egg-info → omdev-0.0.0.dev52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev51
+Version: 0.0.0.dev52
 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.dev51
+Requires-Dist: omlish==0.0.0.dev52
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev51 → omdev-0.0.0.dev52}/omdev/manifests/build.py

@@ -13,9 +13,13 @@ See (entry_points):
 # ruff: noqa: UP006 UP007
 import argparse
 import collections
+import concurrent.futures as cf
 import dataclasses as dc
+import functools
 import inspect
+import itertools
 import json
+import multiprocessing as mp
 import os.path
 import re
 import shlex
@@ -195,6 +199,7 @@ def build_module_manifests(
 
 
 def build_package_manifests(
+        ex: cf.Executor,
         name: str,
         base: str,
         *,
@@ -204,14 +209,20 @@ def build_package_manifests(
     if not os.path.isdir(pkg_dir) or not os.path.isfile(os.path.join(pkg_dir, '__init__.py')):
         raise Exception(pkg_dir)
 
-    manifests: ta.List[Manifest] = []
-
-    for file in sorted(findmagic.find_magic(
-            [pkg_dir],
-            [MANIFEST_MAGIC],
-            ['py'],
-    )):
-        manifests.extend(build_module_manifests(os.path.relpath(file, base), base))
+    files = sorted(findmagic.find_magic(
+        [pkg_dir],
+        [MANIFEST_MAGIC],
+        ['py'],
+    ))
+    futs = [
+        ex.submit(functools.partial(
+            build_module_manifests,
+            os.path.relpath(file, base),
+            base,
+        ))
+        for file in files
+    ]
+    manifests: ta.List[Manifest] = list(itertools.chain.from_iterable(fut.result() for fut in futs))
 
     if write:
         with open(os.path.join(pkg_dir, '.manifests.json'), 'w') as f:
@@ -266,14 +277,22 @@ if __name__ == '__main__':
     def _gen_cmd(args) -> None:
         base = _get_base(args)
 
-        for pkg in args.package:
-            ms = build_package_manifests(
-                pkg,
-                base,
-                write=args.write or False,
-            )
+        num_threads = args.jobs or max(mp.cpu_count() // 2, 1)
+        with cf.ThreadPoolExecutor(num_threads) as ex:
+            futs = [
+                ex.submit(functools.partial(
+                    build_package_manifests,
+                    ex,
+                    pkg,
+                    base,
+                    write=args.write or False,
+                ))
+                for pkg in args.package
+            ]
+            mss = [fut.result() for fut in futs]
             if not args.quiet:
-                print(json_dumps_pretty([dc.asdict(m) for m in ms]))
+                for ms in mss:
+                    print(json_dumps_pretty([dc.asdict(m) for m in ms]))
 
     def _check_cmd(args) -> None:
         base = _get_base(args)
@@ -294,6 +313,7 @@ if __name__ == '__main__':
         parser_gen.add_argument('-b', '--base')
         parser_gen.add_argument('-w', '--write', action='store_true')
         parser_gen.add_argument('-q', '--quiet', action='store_true')
+        parser_gen.add_argument('-j', '--jobs', type=int)
         parser_gen.add_argument('package', nargs='*')
         parser_gen.set_defaults(func=_gen_cmd)
 

omdev-0.0.0.dev52/omdev/secrets.py

@@ -0,0 +1,17 @@
+import os.path
+
+import yaml
+
+from omlish import secrets as sec
+
+
+SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
+
+
+def load_secrets() -> sec.Secrets:
+    dct: dict[str, sec.Secret] = {}
+    with open(SECRETS_PATH) as f:
+        for k, v in yaml.safe_load(f).items():
+            if isinstance(v, str):
+                dct[k] = sec.Secret(key=k, value=v)
+    return sec.MappingSecrets(dct)

{omdev-0.0.0.dev51 → omdev-0.0.0.dev52/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev51
+Version: 0.0.0.dev52
 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.dev51
+Requires-Dist: omlish==0.0.0.dev52
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev51 → omdev-0.0.0.dev52}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev51
+omlish==0.0.0.dev52
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev51 → omdev-0.0.0.dev52}/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.dev51'
+version = '0.0.0.dev52'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev51',
+    'omlish == 0.0.0.dev52',
 ]
 
 [project.optional-dependencies]
@@ -73,6 +73,7 @@ exclude = [
     '*.c',
     '*.cc',
     '*.cu',
+    '*.g4',
     '*.h',
     '.manifests.json',
     'LICENSE',

omdev-0.0.0.dev51/omdev/secrets.py

@@ -1,12 +0,0 @@
-import os.path
-import typing as ta
-
-import yaml
-
-
-SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
-
-
-def load_secrets() -> dict[str, ta.Any]:
-    with open(SECRETS_PATH) as f:
-        return yaml.safe_load(f)