omdev 0.0.0.dev533__tar.gz → 0.0.0.dev534__tar.gz

{omdev-0.0.0.dev533/omdev.egg-info → omdev-0.0.0.dev534}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev533
+Version: 0.0.0.dev534
 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.dev533
+Requires-Dist: omlish==0.0.0.dev534
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../omlish/lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -355,7 +355,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -375,7 +375,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -400,7 +400,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -412,7 +412,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/dockerdev/cli.py

@@ -1,3 +1,46 @@
+"""
+TODO:
+ - default run bash
+ - all of the below stuff
+
+====
+
+if [ -t 1 ] ; then
+   TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)"
+else
+   TTY_ENV_ARGS=""
+fi
+
+SERVICE_NAME="$(basename "$SCRIPT_DIR")-dev"
+if ! [ $# -eq 0 ] ; then
+    if [ "$1" = "--amd64" ] ; then
+        SERVICE_NAME="$SERVICE_NAME-amd64"
+        shift
+    fi
+fi
+
+CONTAINER_ID=$(docker-compose -f 'docker/compose.yml' ps -q "$SERVICE_NAME")
+if [ -z "$CONTAINER_ID" ] ; then
+    echo "$SERVICE_NAME not running" 1>&2
+    exit 1
+fi
+
+if [ -z "$DOCKER_HOST_PLATFORM" ] ; then
+    if [ $(uname) = "Linux" ] ; then
+        DOCKER_HOST_PLATFORM=linux
+    elif [ $(uname) = "Darwin" ] ; then
+        DOCKER_HOST_PLATFORM=darwin
+    fi
+fi
+
+exec docker exec \
+    $TTY_ENV_ARGS \
+    -e DOCKER_HOST_PLATFORM="$DOCKER_HOST_PLATFORM" \
+    --privileged \
+    --detach-keys 'ctrl-o,ctrl-d' \
+    -it "$CONTAINER_ID" \
+    "$@"
+"""
 import os.path
 import re
 import shutil

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/manifests/_dumping.py

@@ -39,7 +39,7 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../omlish/lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -471,7 +471,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -491,7 +491,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -516,7 +516,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -528,7 +528,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/pyproject/pkg.py

@@ -27,6 +27,7 @@ vcs+protocol://repo_url/#egg=pkg&subdirectory=pkg_dir
 # ruff: noqa: UP006 UP007 UP045
 import abc
 import dataclasses as dc
+import glob
 import importlib
 import inspect
 import os.path
@@ -40,6 +41,7 @@ import typing as ta
 from omlish.formats.toml.writer import TomlWriter
 from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
 from omlish.logs.modules import get_module_logger
 from omlish.subprocesses.sync import subprocesses
 
@@ -150,28 +152,59 @@ class BasePyprojectPackageGenerator(Abstract):
         inc: ta.List[str]
         exc: ta.List[str]
 
+    _PKG_DATA_EXCLUDE_DIRS: ta.ClassVar[ta.AbstractSet[str]] = frozenset([
+        '__pycache__',
+    ])
+
     @cached_nullary
-    def _collect_pkg_data(self) -> _PkgData:
-        inc: ta.List[str] = []
-        exc: ta.List[str] = []
+    def _collect_pkg_data(self) -> ta.Mapping[str, _PkgData]:
+        dct: ta.Dict[str, BasePyprojectPackageGenerator._PkgData] = {}
 
         for p, ds, fs in os.walk(self._dir_name):  # noqa
             for f in fs:
                 if f != '.pkgdata':
                     continue
-                rp = os.path.relpath(p, self._dir_name)
-                log.info('Found pkgdata %s for pkg %s', rp, self._dir_name)
+
+                log.info('Found pkgdata %s', p)
                 with open(os.path.join(p, f)) as fo:
                     src = fo.read()
+
+                pn = p.replace(os.sep, '.')
+                check.not_in(pn, dct)
+
+                inc: ta.List[str] = []
+                exc: ta.List[str] = []
+
                 for l in src.splitlines():
                     if not (l := l.strip()):
                         continue
+
                     if (bang := l.startswith('!')):
                         l = l[1:]
-                    rlp = os.path.join(rp, l) if rp != '.' else l
-                    (exc if bang else inc).append(rlp)
 
-        return self._PkgData(inc, exc)
+                    if '**' in l:
+                        if bang:
+                            raise ValueError('Cannot exclude recursive globs')
+                        check.state(not l.endswith(os.sep))
+                        ge = l.rsplit(os.sep, maxsplit=1)[-1]
+
+                        gds = set()
+                        for g in glob.glob(l, root_dir=p, recursive=True):
+                            if os.path.isfile(gp := os.path.join(p, g)):
+                                if any(gpp in self._PKG_DATA_EXCLUDE_DIRS for gpp in os.path.dirname(gp).split(os.sep)):
+                                    continue
+                                gd = os.path.dirname(g)
+                                gds.add(gd)
+
+                        for gd in sorted(gds):
+                            inc.append(os.path.join(gd, ge))
+
+                    else:
+                        (exc if bang else inc).append(l)
+
+                dct[pn] = self._PkgData(inc, exc)
+
+        return dct
 
     #
 
@@ -353,10 +386,12 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         epd = dict(st.pop('exclude_package_data', {}))
 
         cpd = self._collect_pkg_data()
-        if cpd.inc:
-            pd['*'] = [*pd.get('*', []), *sorted(set(cpd.inc))]
-        if cpd.exc:
-            epd['*'] = [*epd.get('*', []), *sorted(set(cpd.exc))]
+        for pdk, pdv in cpd.items():
+            pdl = TomlWriter.Literal(f"'{pdk}'")
+            if pdv.inc:
+                pd.setdefault(pdl, []).extend(sorted(set(pdv.inc)))
+            if pdv.exc:
+                pd.setdefault(pdl, []).extend(sorted(set(pdv.exc)))
 
         if pd:
             pyp_dct['tool.setuptools.package-data'] = pd

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/ci.py

@@ -101,7 +101,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../omlish/lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
@@ -1372,7 +1372,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -1392,7 +1392,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -1417,7 +1417,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -1429,7 +1429,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/interp.py

@@ -56,7 +56,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../packaging/versions.py', sha1='71627ad600b3529b829b0e227b0952f2c63c7271'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../omlish/lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -970,7 +970,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -990,7 +990,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -1015,7 +1015,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -1027,7 +1027,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/lib/formats/goyaml.py

@@ -35,7 +35,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../../lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../../lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../../lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='errors.py', sha1='8fa73c90292f56f8faaedebb2f478ff6a3b95460'),
             dict(path='tokens.py', sha1='d52876a2a525bc99eb554fe28c3d27e7e01f43a9'),
@@ -357,7 +357,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -377,7 +377,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -402,7 +402,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -414,7 +414,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/lib/inject.py

@@ -32,7 +32,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='inject.py', sha1='6f097e3170019a34ff6834d36fcc9cbeed3a7ab4'),
@@ -355,7 +355,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -375,7 +375,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -400,7 +400,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -412,7 +412,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/lib/marshal.py

@@ -41,7 +41,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -356,7 +356,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -376,7 +376,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -401,7 +401,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -413,7 +413,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534}/omdev/scripts/pyproject.py

@@ -96,7 +96,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='df0ed561b5782545e34e61dd3424f69f836a87c0'),
+            dict(path='../../omlish/lite/check.py', sha1='5e625d74d4ad4e0492e25acac42820baa9956965'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -148,7 +148,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/providers/system.py', sha1='9638a154475ca98775159d27739563ac7fb2eb16'),
             dict(path='../interp/pyenv/install.py', sha1='4a10a19717364b4ba9f3b8bf1d12621cf21ba8b8'),
             dict(path='../interp/uv/provider.py', sha1='3c3980878ad2b9fd2cd02172f9424954759c7f06'),
-            dict(path='pkg.py', sha1='fd158f4026f2e0e672f147612b46d8552f262eb3'),
+            dict(path='pkg.py', sha1='b2b63a3906d62e5911d2e5c0ee178041c53eff50'),
             dict(path='../interp/providers/inject.py', sha1='7cc9ebf58cf2ec09545321456bd9da9f9a3a79fb'),
             dict(path='../interp/pyenv/provider.py', sha1='377542ce01a35849e2a5b4a4dbafedc26882f983'),
             dict(path='../interp/uv/inject.py', sha1='e95d058c2340baa5a3155ec3440f311d1daa10a8'),
@@ -2584,7 +2584,7 @@ class Checks:
         ...
 
     def isinstance(self, v, spec, msg=None):
-        if not isinstance(v, self._unpack_isinstance_spec(spec)):
+        if not isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must be instance',
@@ -2604,7 +2604,7 @@ class Checks:
         ...
 
     def of_isinstance(self, spec, msg=None, /):
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.isinstance(v, spec, msg)
@@ -2629,7 +2629,7 @@ class Checks:
         return inner
 
     def not_isinstance(self, v: T, spec: ta.Any, msg: CheckMessage = None, /) -> T:  # noqa
-        if isinstance(v, self._unpack_isinstance_spec(spec)):
+        if isinstance(v, spec if type(spec) is type else self._unpack_isinstance_spec(spec)):
             self._raise(
                 TypeError,
                 'Must not be instance',
@@ -2641,7 +2641,7 @@ class Checks:
         return v
 
     def of_not_isinstance(self, spec: ta.Any, msg: CheckMessage = None, /) -> ta.Callable[[T], T]:
-        spec = self._unpack_isinstance_spec(spec)
+        spec = spec if type(spec) is type else self._unpack_isinstance_spec(spec)
 
         def inner(v):
             return self.not_isinstance(v, spec, msg)
@@ -11785,28 +11785,59 @@ class BasePyprojectPackageGenerator(Abstract):
         inc: ta.List[str]
         exc: ta.List[str]
 
+    _PKG_DATA_EXCLUDE_DIRS: ta.ClassVar[ta.AbstractSet[str]] = frozenset([
+        '__pycache__',
+    ])
+
     @cached_nullary
-    def _collect_pkg_data(self) -> _PkgData:
-        inc: ta.List[str] = []
-        exc: ta.List[str] = []
+    def _collect_pkg_data(self) -> ta.Mapping[str, _PkgData]:
+        dct: ta.Dict[str, BasePyprojectPackageGenerator._PkgData] = {}
 
         for p, ds, fs in os.walk(self._dir_name):  # noqa
             for f in fs:
                 if f != '.pkgdata':
                     continue
-                rp = os.path.relpath(p, self._dir_name)
-                log.info('Found pkgdata %s for pkg %s', rp, self._dir_name)
+
+                log.info('Found pkgdata %s', p)
                 with open(os.path.join(p, f)) as fo:
                     src = fo.read()
+
+                pn = p.replace(os.sep, '.')
+                check.not_in(pn, dct)
+
+                inc: ta.List[str] = []
+                exc: ta.List[str] = []
+
                 for l in src.splitlines():
                     if not (l := l.strip()):
                         continue
+
                     if (bang := l.startswith('!')):
                         l = l[1:]
-                    rlp = os.path.join(rp, l) if rp != '.' else l
-                    (exc if bang else inc).append(rlp)
 
-        return self._PkgData(inc, exc)
+                    if '**' in l:
+                        if bang:
+                            raise ValueError('Cannot exclude recursive globs')
+                        check.state(not l.endswith(os.sep))
+                        ge = l.rsplit(os.sep, maxsplit=1)[-1]
+
+                        gds = set()
+                        for g in glob.glob(l, root_dir=p, recursive=True):
+                            if os.path.isfile(gp := os.path.join(p, g)):
+                                if any(gpp in self._PKG_DATA_EXCLUDE_DIRS for gpp in os.path.dirname(gp).split(os.sep)):
+                                    continue
+                                gd = os.path.dirname(g)
+                                gds.add(gd)
+
+                        for gd in sorted(gds):
+                            inc.append(os.path.join(gd, ge))
+
+                    else:
+                        (exc if bang else inc).append(l)
+
+                dct[pn] = self._PkgData(inc, exc)
+
+        return dct
 
     #
 
@@ -11988,10 +12019,12 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         epd = dict(st.pop('exclude_package_data', {}))
 
         cpd = self._collect_pkg_data()
-        if cpd.inc:
-            pd['*'] = [*pd.get('*', []), *sorted(set(cpd.inc))]
-        if cpd.exc:
-            epd['*'] = [*epd.get('*', []), *sorted(set(cpd.exc))]
+        for pdk, pdv in cpd.items():
+            pdl = TomlWriter.Literal(f"'{pdk}'")
+            if pdv.inc:
+                pd.setdefault(pdl, []).extend(sorted(set(pdv.inc)))
+            if pdv.exc:
+                pd.setdefault(pdl, []).extend(sorted(set(pdv.exc)))
 
         if pd:
             pyp_dct['tool.setuptools.package-data'] = pd

{omdev-0.0.0.dev533 → omdev-0.0.0.dev534/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev533
+Version: 0.0.0.dev534
 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.dev533
+Requires-Dist: omlish==0.0.0.dev534
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"