omlish 0.0.0.dev26__py3-none-any.whl → 0.0.0.dev27__py3-none-any.whl

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/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/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.dist-info → omlish-0.0.0.dev27.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev27.dist-info}/RECORD

@@ -1,6 +1,6 @@
-omlish/__about__.py,sha256=ItiHbRodt34cICvvQxV6BpYmCzBfKRGd46tuo5JLO-o,2714
+omlish/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
+omlish/__about__.py,sha256=zjwXesy8pai60AJpe7FV4t72dwRlRVraIytt0d1XmnE,2721
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/_manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
 omlish/argparse.py,sha256=QRQmX9G0-L_nATkFtGHvpd4qrpYzKATdjuFLbBqzJPM,6224
 omlish/c3.py,sha256=W5EwYx9Por3rWYLkKUitJ6OoRMLLgVTfLTyroOz41Y0,8047
 omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
@@ -178,7 +178,7 @@ omlish/lang/iterables.py,sha256=_q6rHbdFfW3VBqez0IV3rUABoNxsA_oBv_sykm5zsbQ,2243
 omlish/lang/maybes.py,sha256=NYHZDjqDtwPMheDrj2VtUVujxRPf8Qpgk4ZlZCTvBZc,3492
 omlish/lang/objects.py,sha256=1dY8dX5voIZf5FBYUiN0BRsWg2JCdsgRbDl9fLG7OtY,4310
 omlish/lang/resolving.py,sha256=OuN2mDTPNyBUbcrswtvFKtj4xgH4H4WglgqSKv3MTy0,1606
-omlish/lang/resources.py,sha256=ZOJVauqeNSuX-IzePr_PmzCheX1e0vTfLAw-832cgrI,1673
+omlish/lang/resources.py,sha256=BD3EaLvTUPpUHfccfiSnnjuvlRhFwv_bcVOzwPPh1rw,2134
 omlish/lang/strings.py,sha256=ykeoou4JK7CEZXzrUJfqVOalEDvE--j0uhHt_SrsrUs,2834
 omlish/lang/sys.py,sha256=UoZz_PJYVKLQAKqYxxn-LHz1okK_38I__maZgnXMcxU,406
 omlish/lang/timeouts.py,sha256=vECdWYhc_IZgcal1Ng1Y42wf2FV3KAx-i8As-MgGHIQ,1186
@@ -198,7 +198,7 @@ omlish/lifecycles/states.py,sha256=zqMOU2ZU-MDNnWuwauM3_anIAiXM8LoBDElDEraptFg,1
 omlish/lifecycles/transitions.py,sha256=qQtFby-h4VzbvgaUqT2NnbNumlcOx9FVVADP9t83xj4,1939
 omlish/lite/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/lite/cached.py,sha256=dUm647FbIsoxWT23XUFM51F7i-C2Buxr5b5zzgbCtQI,546
-omlish/lite/check.py,sha256=DR3Zj-7o4Y7pNheln68nN_BdX9zaotGQ2y8v97GDiWQ,535
+omlish/lite/check.py,sha256=DYxkYkxpnQpjGpDwW_8M8YBXbswvnBUCr0UBPU7aNKo,642
 omlish/lite/contextmanagers.py,sha256=HnQJiyrOmSvTL22XRJrFl5CLpCyHD9fsntEUAr9G-60,427
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=PeJZUJWd1K-UFErVs0wtD0zRMFW5-olUNFVVZAj_ScY,5549
@@ -310,8 +310,8 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=KGgo0wHOIMVMZtDso-rhSWKAcAkYAH2IGpg9tULabu8,6505
-omlish-0.0.0.dev26.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev26.dist-info/METADATA,sha256=0sGW6ZHnoftJe1kQm2MsivDjv2_mfWT81njFwRslZmA,3666
-omlish-0.0.0.dev26.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev26.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev26.dist-info/RECORD,,
+omlish-0.0.0.dev27.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev27.dist-info/METADATA,sha256=y3f_PoZpAVj2Mpn51ruURaZtqJ0Tm8YWmtFacYsa0ck,3666
+omlish-0.0.0.dev27.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev27.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev27.dist-info/RECORD,,