omdev 0.0.0.dev9__tar.gz → 0.0.0.dev11__tar.gz

{omdev-0.0.0.dev9/omdev.egg-info → omdev-0.0.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev9
+Version: 0.0.0.dev11
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev9
+Requires-Dist: omlish==0.0.0.dev11
+Provides-Extra: all
+Requires-Dist: pycparser>=2.22; extra == "all"
+Requires-Dist: cffi>=1.17; extra == "all"
+Requires-Dist: pcpp>=1.30; extra == "all"
+Requires-Dist: mypy>=1.11; extra == "all"
+Requires-Dist: tokenize_rt>=6; extra == "all"
 Provides-Extra: c
 Requires-Dist: pycparser>=2.22; extra == "c"
 Requires-Dist: cffi>=1.17; extra == "c"

omdev-0.0.0.dev11/README.rst

@@ -0,0 +1,5 @@
+*omlish*
+
+Packages installable from git via:
+::
+  pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/exts/cmake.py

@@ -18,18 +18,23 @@ Done:
 
 """  # noqa
 import io
+import logging
 import os.path
 import shutil
 import sys
 import sysconfig
 
 from omlish import check
+from omlish import logs
 
 from .. import cmake
 
 
+log = logging.getLogger(__name__)
+
+
 def _main() -> None:
-    # py_root = '$ENV{HOME}/.pyenv/versions/3.11.8/'
+    logs.configure_standard_logging('INFO')
 
     prj_root = os.path.abspath(os.getcwd())
     if not os.path.isfile(os.path.join(prj_root, 'pyproject.toml')):
@@ -51,9 +56,13 @@ def _main() -> None:
     with open(os.path.join(cmake_dir, '.gitignore'), 'w') as f:
         f.write('\n'.join(sorted(['/cmake-*', '/build'])))
 
-    if os.path.isdir(os.path.join(cmake_dir, '.idea')):
-        with open(os.path.join(cmake_dir, '.idea', '.name'), 'w') as f:
-            f.write('omlish')
+    # idea_dir = os.path.join(cmake_dir, '.idea')
+    # if not os.path.isdir(idea_dir):
+    #     os.mkdir(idea_dir)
+    # idea_name_file = os.path.join(idea_dir, '.name')
+    # if not os.path.isfile(idea_name_file):
+    #     with open(idea_name_file, 'w') as f:
+    #         f.write('omlish')
 
     venv_exe = sys.executable
     venv_root = os.path.abspath(os.path.join(os.path.dirname(venv_exe), '..'))
@@ -138,8 +147,12 @@ def _main() -> None:
         'omdev/exts/_boilerplate.cc',
         'x/dev/c/junk.cc',
         'x/dev/c/_uuid.cc',
+        'x/dev/c/csv/_csvloader.cc',
     ]:
         ext_name = ext_src.rpartition('.')[0].replace('/', '__')
+
+        log.info('Adding cmake c extension: %s -> %s', ext_src, ext_name)
+
         so_name = ''.join([
             os.path.basename(ext_src).split('.')[0],
             '.',
@@ -186,7 +199,7 @@ def _main() -> None:
             ],
         ))
 
-    print(out.getvalue())
+    # print(out.getvalue())
     with open(os.path.join(cmake_dir, 'CMakeLists.txt'), 'w') as f:
         f.write(out.getvalue())
 

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/interp/pyenv.py

@@ -67,8 +67,10 @@ class Pyenv:
         return os.path.join(check_not_none(self.root()), 'bin', 'pyenv')
 
     def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
+        if (root := self.root()) is None:
+            return []
         ret = []
-        vp = os.path.join(self.root(), 'versions')
+        vp = os.path.join(root, 'versions')
         for dn in os.listdir(vp):
             ep = os.path.join(vp, dn, 'bin', 'python')
             if not os.path.isfile(ep):
@@ -77,6 +79,8 @@ class Pyenv:
         return ret
 
     def installable_versions(self) -> ta.List[str]:
+        if self.root() is None:
+            return []
         ret = []
         s = subprocess_check_output_str(self.exe(), 'install', '--list')
         for l in s.splitlines():

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/pyproject/cli.py

@@ -26,6 +26,7 @@ import dataclasses as dc
 import functools
 import glob
 import itertools
+import multiprocessing as mp
 import os.path
 import shlex
 import shutil
@@ -247,13 +248,12 @@ def _venv_cmd(args) -> None:
         )
         return
 
-    venv.create()
-
     cmd = args.cmd
     if not cmd:
-        pass
+        venv.create()
 
     elif cmd == 'python':
+        venv.create()
         os.execl(
             (exe := venv.exe()),
             exe,
@@ -261,10 +261,12 @@ def _venv_cmd(args) -> None:
         )
 
     elif cmd == 'exe':
+        venv.create()
         check_not(args.args)
         print(venv.exe())
 
     elif cmd == 'run':
+        venv.create()
         sh = check_not_none(shutil.which('bash'))
         script = ' '.join(args.args)
         if not script:
@@ -281,6 +283,7 @@ def _venv_cmd(args) -> None:
         print('\n'.join(venv.srcs()))
 
     elif cmd == 'test':
+        venv.create()
         subprocess_check_call(venv.exe(), '-m', 'pytest', *(args.args or []), *venv.srcs())
 
     else:
@@ -294,7 +297,10 @@ def _pkg_cmd(args) -> None:
     run = Run()
 
     cmd = args.cmd
-    if cmd == 'gen':
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
         build_root = os.path.join('.pkg')
 
         if os.path.exists(build_root):
@@ -303,11 +309,10 @@ def _pkg_cmd(args) -> None:
         build_output_dir = 'dist'
         run_build = bool(args.build)
 
-        num_threads = 8
-
         if run_build:
             os.makedirs(build_output_dir, exist_ok=True)
 
+        num_threads = max(mp.cpu_count() // 2, 1)
         with cf.ThreadPoolExecutor(num_threads) as ex:
             futs = [
                 ex.submit(functools.partial(

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/pyproject/pkg.py

@@ -115,6 +115,8 @@ class PyprojectPackageGenerator:
     def file_contents(self) -> FileContents:
         pyp_dct = {}
 
+        #
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
@@ -122,14 +124,29 @@ class PyprojectPackageGenerator:
 
         prj = self._build_cls_dct(self.project_cls())
         pyp_dct['project'] = prj
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, 'project.optional-dependencies')
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
 
         st = self._build_cls_dct(self.setuptools_cls())
         pyp_dct['tool.setuptools'] = st
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
 
+        #
+
         return self.FileContents(
             pyp_dct,
             mani_in,

omdev-0.0.0.dev11/omdev/scripts/bracepy.py

@@ -0,0 +1,105 @@
+# !/usr/bin/env python3
+"""
+https://github.com/umlet/pwk/blob/dc23b3400108a71947a695f1fa1df0f514b42528/pwk
+"""
+import io
+import tokenize
+
+
+def translate_brace_python(
+        s: str,
+        *,
+        indent_width: int = 4,
+) -> str:
+    lt = tokenize.tokenize(io.BytesIO(s.encode('utf-8')).readline)
+
+    ret = io.StringIO()
+
+    indent = 0
+    open_braces = 0
+
+    newline = False
+    indent_up = False
+    indent_down = False
+    skip = False
+
+    while True:
+        try:
+            t = next(lt)
+
+            if t.type == tokenize.ENCODING:
+                last_t = t
+                continue
+
+            if t.type == tokenize.OP and t.string == ';':
+                newline = True
+
+            elif t.type == tokenize.OP and t.string == ':':
+                if open_braces == 0:
+                    newline = True
+                    indent_up = True
+
+            elif t.type == tokenize.OP and t.string == '{':
+                if last_t.type == tokenize.OP and last_t.string == ':':  # noqa
+                    skip = True
+                else:
+                    open_braces += 1
+
+            elif t.type == tokenize.OP and t.string == '}':
+                if open_braces > 0:
+                    open_braces -= 1
+                elif open_braces == 0:
+                    if indent > 0:
+                        newline = True
+                        indent_down = True
+                        skip = True
+                    else:
+                        raise Exception('Too many closing braces')
+
+            if indent_up:
+                indent += indent_width
+            elif indent_down:
+                indent -= indent_width
+
+            if newline and indent_up:
+                ret.write(':\n' + ' ' * indent)
+            elif newline:
+                ret.write('\n' + ' ' * indent)
+            elif not skip:
+                ret.write(t.string)
+                ret.write(' ')
+
+            newline = False
+            indent_up = False
+            indent_down = False
+            skip = False
+            last_t = t
+
+        except StopIteration:
+            break
+        except tokenize.TokenError:
+            continue
+
+    ret.write('\n')
+    return ret.getvalue()
+
+
+def _main(argv=None) -> None:
+    import argparse
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-x', '--exec', action='store_true')
+    parser.add_argument('cmd')
+
+    args = parser.parse_args(argv)
+
+    src = translate_brace_python(args.cmd)
+
+    if args.exec:
+        exec(src)
+    else:
+        print(src)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/scripts/interp.py

@@ -1669,8 +1669,10 @@ class Pyenv:
         return os.path.join(check_not_none(self.root()), 'bin', 'pyenv')
 
     def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
+        if (root := self.root()) is None:
+            return []
         ret = []
-        vp = os.path.join(self.root(), 'versions')
+        vp = os.path.join(root, 'versions')
         for dn in os.listdir(vp):
             ep = os.path.join(vp, dn, 'bin', 'python')
             if not os.path.isfile(ep):
@@ -1679,6 +1681,8 @@ class Pyenv:
         return ret
 
     def installable_versions(self) -> ta.List[str]:
+        if self.root() is None:
+            return []
         ret = []
         s = subprocess_check_output_str(self.exe(), 'install', '--list')
         for l in s.splitlines():

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev/scripts/pyproject.py

@@ -39,6 +39,7 @@ import inspect
 import itertools
 import json
 import logging
+import multiprocessing as mp
 import os
 import os.path
 import re
@@ -2813,6 +2814,8 @@ class PyprojectPackageGenerator:
     def file_contents(self) -> FileContents:
         pyp_dct = {}
 
+        #
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
@@ -2820,14 +2823,29 @@ class PyprojectPackageGenerator:
 
         prj = self._build_cls_dct(self.project_cls())
         pyp_dct['project'] = prj
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, 'project.optional-dependencies')
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
 
         st = self._build_cls_dct(self.setuptools_cls())
         pyp_dct['tool.setuptools'] = st
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
 
+        #
+
         return self.FileContents(
             pyp_dct,
             mani_in,
@@ -3208,8 +3226,10 @@ class Pyenv:
         return os.path.join(check_not_none(self.root()), 'bin', 'pyenv')
 
     def version_exes(self) -> ta.List[ta.Tuple[str, str]]:
+        if (root := self.root()) is None:
+            return []
         ret = []
-        vp = os.path.join(self.root(), 'versions')
+        vp = os.path.join(root, 'versions')
         for dn in os.listdir(vp):
             ep = os.path.join(vp, dn, 'bin', 'python')
             if not os.path.isfile(ep):
@@ -3218,6 +3238,8 @@ class Pyenv:
         return ret
 
     def installable_versions(self) -> ta.List[str]:
+        if self.root() is None:
+            return []
         ret = []
         s = subprocess_check_output_str(self.exe(), 'install', '--list')
         for l in s.splitlines():
@@ -3878,13 +3900,12 @@ def _venv_cmd(args) -> None:
         )
         return
 
-    venv.create()
-
     cmd = args.cmd
     if not cmd:
-        pass
+        venv.create()
 
     elif cmd == 'python':
+        venv.create()
         os.execl(
             (exe := venv.exe()),
             exe,
@@ -3892,10 +3913,12 @@ def _venv_cmd(args) -> None:
         )
 
     elif cmd == 'exe':
+        venv.create()
         check_not(args.args)
         print(venv.exe())
 
     elif cmd == 'run':
+        venv.create()
         sh = check_not_none(shutil.which('bash'))
         script = ' '.join(args.args)
         if not script:
@@ -3912,6 +3935,7 @@ def _venv_cmd(args) -> None:
         print('\n'.join(venv.srcs()))
 
     elif cmd == 'test':
+        venv.create()
         subprocess_check_call(venv.exe(), '-m', 'pytest', *(args.args or []), *venv.srcs())
 
     else:
@@ -3925,7 +3949,10 @@ def _pkg_cmd(args) -> None:
     run = Run()
 
     cmd = args.cmd
-    if cmd == 'gen':
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
         build_root = os.path.join('.pkg')
 
         if os.path.exists(build_root):
@@ -3934,11 +3961,10 @@ def _pkg_cmd(args) -> None:
         build_output_dir = 'dist'
         run_build = bool(args.build)
 
-        num_threads = 8
-
         if run_build:
             os.makedirs(build_output_dir, exist_ok=True)
 
+        num_threads = max(mp.cpu_count() // 2, 1)
         with cf.ThreadPoolExecutor(num_threads) as ex:
             futs = [
                 ex.submit(functools.partial(

omdev-0.0.0.dev11/omdev/tools/gittools.py

@@ -0,0 +1,22 @@
+import subprocess
+
+from omlish import argparse as ap
+from omlish import logs
+
+
+class Cli(ap.Cli):
+    @ap.command()
+    def blob_sizes(self) -> None:
+        # https://stackoverflow.com/a/42544963
+        subprocess.check_call(  # noqa
+            "git rev-list --objects --all | "
+            "git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | "
+            "sed -n 's/^blob //p' | "
+            "sort --numeric-sort --key=2",
+            shell=True,
+        )
+
+
+if __name__ == '__main__':
+    logs.configure_standard_logging('INFO')
+    Cli()()

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev9
+Version: 0.0.0.dev11
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev9
+Requires-Dist: omlish==0.0.0.dev11
+Provides-Extra: all
+Requires-Dist: pycparser>=2.22; extra == "all"
+Requires-Dist: cffi>=1.17; extra == "all"
+Requires-Dist: pcpp>=1.30; extra == "all"
+Requires-Dist: mypy>=1.11; extra == "all"
+Requires-Dist: tokenize_rt>=6; extra == "all"
 Provides-Extra: c
 Requires-Dist: pycparser>=2.22; extra == "c"
 Requires-Dist: cffi>=1.17; extra == "c"

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/omdev.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ omdev/pyproject/configs.py
 omdev/pyproject/ext.py
 omdev/pyproject/pkg.py
 omdev/scripts/__init__.py
+omdev/scripts/bracepy.py
 omdev/scripts/execrss.py
 omdev/scripts/findimports.py
 omdev/scripts/findmagic.py
@@ -65,6 +66,7 @@ omdev/toml/parser.py
 omdev/toml/writer.py
 omdev/tools/__init__.py
 omdev/tools/dockertools.py
+omdev/tools/gittools.py
 omdev/tools/sqlrepl.py
 omdev/versioning/__init__.py
 omdev/versioning/specifiers.py

omdev-0.0.0.dev11/omdev.egg-info/requires.txt

@@ -0,0 +1,19 @@
+omlish==0.0.0.dev11
+
+[all]
+pycparser>=2.22
+cffi>=1.17
+pcpp>=1.30
+mypy>=1.11
+tokenize_rt>=6
+
+[c]
+pycparser>=2.22
+cffi>=1.17
+pcpp>=1.30
+
+[mypy]
+mypy>=1.11
+
+[tokens]
+tokenize_rt>=6

{omdev-0.0.0.dev9 → omdev-0.0.0.dev11}/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.dev9'
+version = '0.0.0.dev11'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,10 +22,17 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev9',
+    'omlish == 0.0.0.dev11',
 ]
 
 [project.optional-dependencies]
+all = [
+    'pycparser >= 2.22',
+    'cffi >= 1.17',
+    'pcpp >= 1.30',
+    'mypy >= 1.11',
+    'tokenize_rt >= 6',
+]
 c = [
     'pycparser >= 2.22',
     'cffi >= 1.17',

omdev-0.0.0.dev9/README.rst

@@ -1 +0,0 @@
-*omlish*

omdev-0.0.0.dev9/omdev.egg-info/requires.txt

@@ -1,12 +0,0 @@
-omlish==0.0.0.dev9
-
-[c]
-pycparser>=2.22
-cffi>=1.17
-pcpp>=1.30
-
-[mypy]
-mypy>=1.11
-
-[tokens]
-tokenize_rt>=6