omdev 0.0.0.dev19__tar.gz → 0.0.0.dev21__tar.gz

{omdev-0.0.0.dev19/omdev.egg-info → omdev-0.0.0.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev19
+Version: 0.0.0.dev21
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,11 +12,12 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev19
+Requires-Dist: omlish==0.0.0.dev21
 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: docutils~=0.21; extra == "all"
 Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: tokenize_rt~=6.0; extra == "all"
 Requires-Dist: wheel~=0.44; extra == "all"
@@ -24,6 +25,8 @@ Provides-Extra: c
 Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: cffi~=1.17; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
+Provides-Extra: docutils
+Requires-Dist: docutils~=0.21; extra == "docutils"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.11; extra == "mypy"
 Provides-Extra: tokens

omdev-0.0.0.dev21/README.rst

@@ -0,0 +1,10 @@
+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``.
+
+Core packages installable from git via:
+
+.. code-block::
+
+  pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/__about__.py

@@ -18,6 +18,10 @@ class Project(ProjectBase):
             'pcpp ~= 1.30',
         ],
 
+        'docutils': [
+            'docutils ~= 0.21',
+        ],
+
         'mypy': [
             'mypy ~= 1.11',
         ],

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/interp/cli.py

@@ -10,6 +10,7 @@ TODO:
 import argparse
 import typing as ta
 
+from omlish.lite.check import check_not_none
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.runtime import check_runtime_version
 
@@ -26,7 +27,7 @@ def _list_cmd(args) -> None:
 def _resolve_cmd(args) -> None:
     r = DEFAULT_INTERP_RESOLVER
     s = InterpSpecifier.parse(args.version)
-    print(r.resolve(s).exe)
+    print(check_not_none(r.resolve(s)).exe)
 
 
 def _build_parser() -> argparse.ArgumentParser:

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/interp/providers.py

@@ -3,6 +3,7 @@ TODO:
  - backends
   - local builds
   - deadsnakes?
+  - uv
  - loose versions
 """
 import abc

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/interp/pyenv.py

@@ -116,6 +116,7 @@ class PyenvInstallOpts:
 
 DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-s', '-v'])
 DEBUG_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-g'])
+THREADED_PYENV_INSTALL_OPTS = PyenvInstallOpts(conf_opts=['--disable-gil'])
 
 
 #
@@ -176,19 +177,19 @@ class DarwinPyenvInstallOpts(PyenvInstallOptsProvider):
             f"--with-tcltk-libs='-L{tcl_tk_prefix}/lib -ltcl{tcl_tk_ver} -ltk{tcl_tk_ver}'",
         ])
 
-    @cached_nullary
-    def brew_ssl_opts(self) -> PyenvInstallOpts:
-        pkg_config_path = subprocess_check_output_str('brew', '--prefix', 'openssl')
-        if 'PKG_CONFIG_PATH' in os.environ:
-            pkg_config_path += ':' + os.environ['PKG_CONFIG_PATH']
-        return PyenvInstallOpts(env={'PKG_CONFIG_PATH': pkg_config_path})
+    # @cached_nullary
+    # def brew_ssl_opts(self) -> PyenvInstallOpts:
+    #     pkg_config_path = subprocess_check_output_str('brew', '--prefix', 'openssl')
+    #     if 'PKG_CONFIG_PATH' in os.environ:
+    #         pkg_config_path += ':' + os.environ['PKG_CONFIG_PATH']
+    #     return PyenvInstallOpts(env={'PKG_CONFIG_PATH': pkg_config_path})
 
     def opts(self) -> PyenvInstallOpts:
         return PyenvInstallOpts().merge(
             self.framework_opts(),
             self.brew_deps_opts(),
             self.brew_tcl_opts(),
-            self.brew_ssl_opts(),
+            # self.brew_ssl_opts(),
         )
 
 
@@ -202,27 +203,39 @@ PLATFORM_PYENV_INSTALL_OPTS: ta.Dict[str, PyenvInstallOptsProvider] = {
 
 
 class PyenvVersionInstaller:
+    """
+    Messy: can install freethreaded build with a 't' suffixed version str _or_ by THREADED_PYENV_INSTALL_OPTS - need
+    latter to build custom interp with ft, need former to use canned / blessed interps. Muh.
+    """
 
     def __init__(
             self,
             version: str,
             opts: ta.Optional[PyenvInstallOpts] = None,
+            interp_opts: InterpOpts = InterpOpts(),
             *,
-            debug: bool = False,
+            no_default_opts: bool = False,
             pyenv: Pyenv = Pyenv(),
     ) -> None:
         super().__init__()
 
-        if opts is None:
-            lst = [DEFAULT_PYENV_INSTALL_OPTS]
-            if debug:
+        if no_default_opts:
+            if opts is None:
+                opts = PyenvInstallOpts()
+        else:
+            lst = [opts if opts is not None else DEFAULT_PYENV_INSTALL_OPTS]
+            if interp_opts.debug:
                 lst.append(DEBUG_PYENV_INSTALL_OPTS)
+            if interp_opts.threaded:
+                lst.append(THREADED_PYENV_INSTALL_OPTS)
             lst.append(PLATFORM_PYENV_INSTALL_OPTS[sys.platform].opts())
             opts = PyenvInstallOpts().merge(*lst)
 
         self._version = version
         self._opts = opts
-        self._debug = debug
+        self._interp_opts = interp_opts
+
+        self._no_default_opts = no_default_opts
         self._pyenv = pyenv
 
     @property
@@ -235,7 +248,7 @@ class PyenvVersionInstaller:
 
     @cached_nullary
     def install_name(self) -> str:
-        return self._version + ('-debug' if self._debug else '')
+        return self._version + ('-debug' if self._interp_opts.debug else '')
 
     @cached_nullary
     def install_dir(self) -> str:
@@ -243,7 +256,7 @@ class PyenvVersionInstaller:
 
     @cached_nullary
     def install(self) -> str:
-        env = dict(self._opts.env)
+        env = {**os.environ, **self._opts.env}
         for k, l in [
             ('CFLAGS', self._opts.cflags),
             ('LDFLAGS', self._opts.ldflags),
@@ -254,7 +267,13 @@ class PyenvVersionInstaller:
                 v += ' ' + os.environ[k]
             env[k] = v
 
-        subprocess_check_call(self._pyenv.exe(), 'install', *self._opts.opts, self._version, env=env)
+        subprocess_check_call(
+            self._pyenv.exe(),
+            'install',
+            *self._opts.opts,
+            self._version,
+            env=env,
+        )
 
         exe = os.path.join(self.install_dir(), 'bin', 'python')
         if not os.path.isfile(exe):
@@ -355,3 +374,18 @@ class PyenvInterpProvider(InterpProvider):
             for d in [False, True]:
                 lst.append(dc.replace(iv, opts=dc.replace(iv.opts, debug=d)))
         return lst
+
+    def install_version(self, version: InterpVersion) -> Interp:
+        inst_version = str(version.version)
+        inst_opts = version.opts
+        if inst_opts.threaded:
+            inst_version += 't'
+            inst_opts = dc.replace(inst_opts, threaded=False)
+
+        installer = PyenvVersionInstaller(
+            inst_version,
+            interp_opts=inst_opts,
+        )
+
+        exe = installer.install()
+        return Interp(exe, version)

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/interp/resolvers.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006
+# ruff: noqa: UP006 UP007
 import abc
 import collections
 import typing as ta
@@ -11,6 +11,7 @@ from .pyenv import PyenvInterpProvider
 from .system import SystemInterpProvider
 from .types import Interp
 from .types import InterpSpecifier
+from .types import InterpVersion
 
 
 INTERP_PROVIDER_TYPES_BY_NAME: ta.Mapping[str, ta.Type[InterpProvider]] = {
@@ -26,17 +27,47 @@ class InterpResolver:
         super().__init__()
         self._providers: ta.Mapping[str, InterpProvider] = collections.OrderedDict(providers)
 
-    def resolve(self, spec: InterpSpecifier) -> Interp:
+    def _resolve_installed(self, spec: InterpSpecifier) -> ta.Optional[ta.Tuple[InterpProvider, InterpVersion]]:
         lst = [
             (i, si)
             for i, p in enumerate(self._providers.values())
             for si in p.get_installed_versions(spec)
             if spec.contains(si)
         ]
-        best = sorted(lst, key=lambda t: (-t[0], t[1]))[-1]
-        bi, bv = best
+
+        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        if not slst:
+            return None
+
+        bi, bv = slst[-1]
         bp = list(self._providers.values())[bi]
-        return bp.get_installed_version(bv)
+        return (bp, bv)
+
+    def resolve(
+            self,
+            spec: InterpSpecifier,
+            *,
+            install: bool = False,
+    ) -> ta.Optional[Interp]:
+        tup = self._resolve_installed(spec)
+        if tup is not None:
+            bp, bv = tup
+            return bp.get_installed_version(bv)
+
+        if not install:
+            return None
+
+        tp = list(self._providers.values())[0]  # noqa
+
+        sv = sorted(
+            [s for s in tp.get_installable_versions(spec) if s in spec],
+            key=lambda s: s.version,
+        )
+        if not sv:
+            return None
+
+        bv = sv[-1]
+        return tp.install_version(bv)
 
     def list(self, spec: InterpSpecifier) -> None:
         print('installed:')

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/interp/types.py

@@ -85,6 +85,9 @@ class InterpSpecifier:
     def contains(self, iv: InterpVersion) -> bool:
         return self.specifier.contains(iv.version) and self.opts == iv.opts
 
+    def __contains__(self, iv: InterpVersion) -> bool:
+        return self.contains(iv)
+
 
 @dc.dataclass(frozen=True)
 class Interp:

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/pyproject/cli.py

@@ -8,6 +8,7 @@ TODO:
  - build / package / publish / version roll
   - {pkg_name: [src_dirs]}, default excludes, generate MANIFST.in, ...
  - env vars - PYTHONPATH
+ - optional uv backend
 
 lookit:
  - https://pdm-project.org/en/latest/
@@ -48,6 +49,7 @@ from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer
 from .configs import VenvConfig
 from .pkg import PyprojectPackageGenerator
+from .reqs import RequirementsRewriter
 
 
 ##
@@ -121,7 +123,7 @@ class Venv:
     @cached_nullary
     def interp_exe(self) -> str:
         i = InterpSpecifier.parse(check_not_none(self._cfg.interp))
-        return DEFAULT_INTERP_RESOLVER.resolve(i).exe
+        return check_not_none(DEFAULT_INTERP_RESOLVER.resolve(i, install=True)).exe
 
     @cached_nullary
     def exe(self) -> str:
@@ -141,6 +143,7 @@ class Venv:
         subprocess_check_call(ie, '-m', 'venv', dn)
 
         ve = self.exe()
+        uv = self._cfg.use_uv
 
         subprocess_check_call(
             ve,
@@ -149,14 +152,20 @@ class Venv:
             'pip',
             'setuptools',
             'wheel',
+            *(['uv'] if uv else []),
         )
 
         if (sr := self._cfg.requires):
+            rr = RequirementsRewriter(self._name)
+            reqs = [rr.rewrite(req) for req in sr]
             subprocess_check_call(
                 ve,
-                '-m', 'pip',
-                'install', '-v',
-                *sr,
+                '-m',
+                *(['uv'] if uv else []),
+                'pip',
+                'install',
+                *([] if uv else ['-v']),
+                *reqs,
             )
 
         return True

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/pyproject/configs.py

@@ -12,6 +12,7 @@ class VenvConfig:
     requires: ta.Optional[ta.List[str]] = None
     docker: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
+    use_uv: ta.Optional[bool] = None
 
 
 @dc.dataclass(frozen=True)

{omdev-0.0.0.dev19 → omdev-0.0.0.dev21}/omdev/pyproject/pkg.py

@@ -40,8 +40,8 @@ from omlish.lite.logs import log
 
 from ..cexts.magic import CextMagic
 from ..findmagic import find_magic
+from ..revisions import GitRevisionAdder
 from ..toml.writer import TomlWriter
-from ..tools.revisions import GitRevisionAdder
 
 
 #

omdev-0.0.0.dev21/omdev/pyproject/reqs.py

@@ -0,0 +1,78 @@
+"""
+TODO:
+ - embed pip._internal.req.parse_requirements, add additional env stuff? breaks compat with raw pip
+"""
+# ruff: noqa: UP007
+import os.path
+import tempfile
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+
+
+class RequirementsRewriter:
+    def __init__(
+            self,
+            venv: ta.Optional[str] = None,
+    ) -> None:
+        super().__init__()
+        self._venv = venv
+
+    @cached_nullary
+    def _tmp_dir(self) -> str:
+        return tempfile.mkdtemp('-omlish-reqs')
+
+    VENV_MAGIC = '# @omdev-venv'
+
+    def rewrite_file(self, in_file: str) -> str:
+        with open(in_file) as f:
+            src = f.read()
+
+        in_lines = src.splitlines(keepends=True)
+        out_lines = []
+
+        for l in in_lines:
+            if self.VENV_MAGIC in l:
+                lp, _, rp = l.partition(self.VENV_MAGIC)
+                rp = rp.partition('#')[0]
+                omit = False
+                for v in rp.split():
+                    if v[0] == '!':
+                        if self._venv is not None and self._venv == v[1:]:
+                            omit = True
+                            break
+                    else:
+                        raise NotImplementedError
+
+                if omit:
+                    out_lines.append('# OMITTED:  ' + l)
+                    continue
+
+            out_req = self.rewrite(l.rstrip('\n'), for_file=True)
+            out_lines.append(out_req + '\n')
+
+        out_file = os.path.join(self._tmp_dir(), os.path.basename(in_file))
+        if os.path.exists(out_file):
+            raise Exception(f'file exists: {out_file}')
+
+        with open(out_file, 'w') as f:
+            f.write(''.join(out_lines))
+        return out_file
+
+    def rewrite(self, in_req: str, *, for_file: bool = False) -> str:
+        if in_req.strip().startswith('-r'):
+            l = in_req.strip()
+            lp, _, rp = l.partition(' ')
+            if lp == '-r':
+                inc_in_file, _, rest = rp.partition(' ')
+            else:
+                inc_in_file, rest = lp[2:], rp
+
+            inc_out_file = self.rewrite_file(inc_in_file)
+            if for_file:
+                return ' '.join(['-r ', inc_out_file, rest])
+            else:
+                return '-r' + inc_out_file
+
+        else:
+            return in_req

{omdev-0.0.0.dev19/omdev/tools → omdev-0.0.0.dev21/omdev}/revisions.py

@@ -18,7 +18,7 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 
-from ..wheelfile import WheelFile
+from .wheelfile import WheelFile
 
 
 ##

omdev-0.0.0.dev21/omdev/scripts/__init__.py

@@ -0,0 +1 @@
+"""Depless, self-contained scripts with no reason to be imported from any other module."""

omdev-0.0.0.dev21/omdev/scripts/bumpversion.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# @omlish-lite
+# @omlish-script
+import argparse
+import re
+import string
+
+
+_VERSION_PAT = re.compile(r"__version__ = '(?P<version>[^\']+)'")
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('file')
+    parser.add_argument('-w', '--write', action='store_true')
+    args = parser.parse_args()
+
+    with open(args.file) as f:
+        src = f.read()
+
+    lines = src.splitlines(keepends=True)
+    for i, l in enumerate(lines):
+        if (m := _VERSION_PAT.fullmatch(l.strip())) is None:
+            continue
+        parts = m.groupdict()['version'].split('.')
+        rp = parts[-1]
+        ni = [i for i in range(len(rp)) if rp[i] not in string.digits][-1] + 1
+        tp, np = rp[:ni], rp[ni:]
+        n = int(np)
+        nv = '.'.join([*parts[:-1], tp + str(n + 1)])
+        lines[i] = f"__version__ = '{nv}'\n"
+    new_src = ''.join(lines)
+
+    if args.write:
+        with open(args.file, 'w') as f:
+            f.write(new_src)
+    else:
+        print(new_src)
+
+
+if __name__ == '__main__':
+    _main()