omdev 0.0.0.dev441__tar.gz → 0.0.0.dev442__tar.gz

{omdev-0.0.0.dev441/omdev.egg-info → omdev-0.0.0.dev442}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev441
+Version: 0.0.0.dev442
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev441
+Requires-Dist: omlish==0.0.0.dev442
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/interp/venvs.py

@@ -21,6 +21,7 @@ from .types import InterpSpecifier
 class InterpVenvConfig:
     interp: ta.Optional[str] = None
     requires: ta.Optional[ta.Sequence[str]] = None
+    requires_pats: ta.Optional[ta.Sequence[str]] = None
     use_uv: ta.Optional[bool] = None
 
 

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/packaging/requires.py

@@ -33,6 +33,12 @@ from omlish.lite.check import check
 from .specifiers import Specifier
 
 
+RequiresMarkerVar = ta.Union['RequiresVariable', 'RequiresValue']  # ta.TypeAlias
+
+RequiresMarkerAtom = ta.Union['RequiresMarkerItem', ta.Sequence['RequiresMarkerAtom']]  # ta.TypeAlias
+RequiresMarkerList = ta.Sequence[ta.Union['RequiresMarkerList', 'RequiresMarkerAtom', str]]  # ta.TypeAlias
+
+
 ##
 
 
@@ -229,12 +235,6 @@ class RequiresOp(RequiresNode):
         return str(self)
 
 
-RequiresMarkerVar = ta.Union['RequiresVariable', 'RequiresValue']
-
-RequiresMarkerAtom = ta.Union['RequiresMarkerItem', ta.Sequence['RequiresMarkerAtom']]
-RequiresMarkerList = ta.Sequence[ta.Union['RequiresMarkerList', 'RequiresMarkerAtom', str]]
-
-
 class RequiresMarkerItem(ta.NamedTuple):
     l: ta.Union[RequiresVariable, RequiresValue]
     op: RequiresOp

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/pyproject/reqs.py

@@ -4,12 +4,16 @@ TODO:
 """
 # ruff: noqa: UP007 UP045
 import os.path
+import re
 import tempfile
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.logs.modules import get_module_logger
 
+from ..packaging.requires import RequiresParserSyntaxError
+from ..packaging.requires import parse_requirement
+
 
 log = get_module_logger(globals())  # noqa
 
@@ -20,11 +24,14 @@ log = get_module_logger(globals())  # noqa
 class RequirementsRewriter:
     def __init__(
             self,
+            *,
             venv: ta.Optional[str] = None,
+            only_pats: ta.Optional[ta.Sequence[re.Pattern]] = None,
     ) -> None:
         super().__init__()
 
         self._venv = venv
+        self._only_pats = only_pats
 
     @cached_nullary
     def _tmp_dir(self) -> str:
@@ -40,17 +47,32 @@ class RequirementsRewriter:
         out_lines = []
 
         for l in in_lines:
-            if self.VENV_MAGIC in l:
-                lp, _, rp = l.partition(self.VENV_MAGIC)
-                rp = rp.partition('#')[0]
+            if l.split('#')[0].strip():
                 omit = False
-                for v in rp.split():
-                    if v[0] == '!':
-                        if self._venv is not None and self._venv == v[1:]:
-                            omit = True
-                            break
+
+                if self.VENV_MAGIC in l:
+                    lp, _, rp = l.partition(self.VENV_MAGIC)
+                    rp = rp.partition('#')[0]
+                    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 (
+                        not omit and
+                        (ops := self._only_pats) is not None and
+                        not l.strip().startswith('-')
+                ):
+                    try:
+                        pr = parse_requirement(l.split('#')[0].strip())
+                    except RequiresParserSyntaxError:
+                        pass
                     else:
-                        raise NotImplementedError
+                        if not any(op.fullmatch(pr.name) for op in ops):
+                            omit = True
 
                 if omit:
                     out_lines.append('# OMITTED:  ' + l)

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/pyproject/venvs.py

@@ -1,6 +1,7 @@
 # ruff: noqa: UP006 UP007 UP045
 import glob
 import os.path
+import re
 import typing as ta
 
 from omlish.lite.cached import async_cached_nullary
@@ -42,7 +43,13 @@ class Venv:
 
     @cached_nullary
     def _iv(self) -> InterpVenv:
-        rr = RequirementsRewriter(self._name)
+        rr = RequirementsRewriter(
+            venv=self._name,
+            only_pats=(
+                [re.compile(p) for p in self._cfg.requires_pats]
+                if self._cfg.requires_pats is not None else None
+            ),
+        )
 
         return InterpVenv(
             self.dir_name,

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/scripts/ci.py

@@ -4718,8 +4718,6 @@ class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
     def __init__(self, v: T) -> None:
-        super().__init__()
-
         self._v = v
 
     @property

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/scripts/interp.py

@@ -2630,8 +2630,6 @@ class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
     def __init__(self, v: T) -> None:
-        super().__init__()
-
         self._v = v
 
     @property

{omdev-0.0.0.dev441 → omdev-0.0.0.dev442}/omdev/scripts/lib/inject.py

@@ -896,8 +896,6 @@ class _JustMaybe(_Maybe[T]):
     __slots__ = ('_v', '_hash')
 
     def __init__(self, v: T) -> None:
-        super().__init__()
-
         self._v = v
 
     @property