omlish 0.0.0.dev26__tar.gz → 0.0.0.dev27__tar.gz

{omlish-0.0.0.dev26/omlish.egg-info → omlish-0.0.0.dev27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev26'
-__revision__ = 'd3cb2e43eac2aa63dc4606aa371faa78ec0daf1a'
+__version__ = '0.0.0.dev27'
+__revision__ = 'c62e03dc2f032aa532d2c2b9f0d71ff96158cdec'
 
 
 #
@@ -126,11 +126,10 @@ class SetuptoolsBase:
         '*': [
             '*.c',
             '*.cc',
+            '*.cu',
             '*.h',
 
-            '*.json',
-
-            '*.sql',
+            '.manifests.json',
 
             'LICENSE',
         ],

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27}/omlish/lang/resources.py

@@ -11,7 +11,7 @@ class RelativeResource(ta.NamedTuple):
 
 
 def get_relative_resources(
-        prefix: str | None = None,
+        path: str = '',
         *,
         globals: ta.Mapping[str, ta.Any] | None = None,  # noqa
         package: str | None = None,
@@ -23,13 +23,29 @@ def get_relative_resources(
         if not file:
             file = globals.get('__file__')
 
+    #
+
+    if os.sep in path:
+        raise ValueError(path)  # noqa
+    if not path.startswith('.'):
+        path = '.' + path
+    if set(path) - {'.'}:
+        dot_pos = next(i for i in range(len(path)) if path[i] != '.')
+        num_up = dot_pos - 1
+        path_parts = path[dot_pos:].split('.')
+    else:
+        num_up = len(path) - 1
+        path_parts = []
+
+    #
+
     lst: list[RelativeResource] = []
 
     if package:
-        anchor = package
-        if prefix:
-            anchor += '.' + prefix.replace(os.sep, '.')
-
+        pkg_parts = package.split('.')
+        if num_up:
+            pkg_parts = pkg_parts[:-num_up]
+        anchor = '.'.join([*pkg_parts, *path_parts])
         for pf in importlib.resources.files(anchor).iterdir():
             lst.append(RelativeResource(
                 name=pf.name,
@@ -38,16 +54,19 @@ def get_relative_resources(
             ))
 
     elif file:
-        path = os.path.dirname(file)
-        if prefix:
-            path = os.path.join(path, prefix.replace('.', os.sep))
+        base_dir = os.path.dirname(file)
+        dst_dir = os.path.join(
+            base_dir,
+            *(['..'] * num_up),
+            *path_parts,
+        )
 
         def _read_file(fp: str) -> bytes:
             with open(fp, 'rb') as f:
                 return f.read()
 
-        for ff in os.listdir(path):
-            ff = os.path.join(path, ff)
+        for ff in os.listdir(dst_dir):
+            ff = os.path.join(dst_dir, ff)
             lst.append(RelativeResource(
                 name=os.path.basename(ff),
                 is_file=os.path.isfile(ff),

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27}/omlish/lite/check.py

@@ -27,3 +27,9 @@ def check_not(v: ta.Any) -> None:
     if v:
         raise ValueError(v)
     return v
+
+
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27}/omlish.egg-info/SOURCES.txt

@@ -2,9 +2,9 @@ LICENSE
 MANIFEST.in
 README.rst
 pyproject.toml
+omlish/.manifests.json
 omlish/__about__.py
 omlish/__init__.py
-omlish/_manifests.json
 omlish/argparse.py
 omlish/c3.py
 omlish/cached.py

{omlish-0.0.0.dev26 → omlish-0.0.0.dev27}/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.dev26'
+version = '0.0.0.dev27'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -120,8 +120,10 @@ exclude = [
 '*' = [
     '*.c',
     '*.cc',
+    '*.cu',
     '*.h',
-    '*.json',
-    '*.sql',
+    '.manifests.json',
     'LICENSE',
+    'specs/jsonschema/schemas/draft202012/*.json',
+    'specs/jsonschema/schemas/draft202012/vocabularies/*.json',
 ]