omlish 0.0.0.dev365__py3-none-any.whl → 0.0.0.dev366__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev365'
-__revision__ = 'b4c28dd8f673c9f03dee99119cd46e8afb3a89f5'
+__version__ = '0.0.0.dev366'
+__revision__ = 'c55c3c03ccdc096a29316198acb1ecaa50da5814'
 
 
 #

omlish/manifests/load.py

@@ -9,6 +9,7 @@ TODO:
 import dataclasses as dc
 import importlib.machinery
 import importlib.resources
+import importlib.util
 import json
 import os.path
 import threading
@@ -121,18 +122,40 @@ class ManifestLoader:
 
     #
 
+    def _read_pkg_file_text(self, pkg_name: str, file_name: str) -> ta.Optional[str]:
+        # importlib.resources.files actually imports the package - to avoid this, if possible, the file is read straight
+        # off the filesystem.
+        spec = importlib.util.find_spec(pkg_name)
+        if (
+                spec is not None and
+                isinstance(spec.loader, importlib.machinery.SourceFileLoader) and
+                spec.origin is not None and
+                os.path.basename(spec.origin) == '__init__.py' and
+                os.path.isfile(spec.origin)
+        ):
+            file_path = os.path.join(os.path.dirname(spec.origin), file_name)
+            if os.path.isfile(file_path):
+                with open(file_path, encoding='utf-8') as f:
+                    return f.read()
+
+        t = importlib.resources.files(pkg_name).joinpath(file_name)
+        if not t.is_file():
+            return None
+        return t.read_text('utf-8')
+
+    MANIFESTS_FILE_NAME: ta.ClassVar[str] = '.manifests.json'
+
     def _load_raw(self, pkg_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
         try:
             return self._raw_cache[pkg_name]
         except KeyError:
             pass
 
-        t = importlib.resources.files(pkg_name).joinpath('.manifests.json')
-        if not t.is_file():
+        src = self._read_pkg_file_text(pkg_name, self.MANIFESTS_FILE_NAME)
+        if src is None:
             self._raw_cache[pkg_name] = None
             return None
 
-        src = t.read_text('utf-8')
         obj = json.loads(src)
         if not isinstance(obj, (list, tuple)):
             raise TypeError(obj)

omlish/text/templating.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - find_vars
+ - some kind of EnvKey / EnvMarker(lang.Marker), namespace-able env keys - but how to weave these into tmpl srcs?
 """
 import abc
 import dataclasses as dc
@@ -27,6 +28,7 @@ class Templater(lang.Abstract):
     This is named a 'templatER', not 'template', because it probably refers to a bigger thing itself called a
     'template' (like a `jinja2.Template`).
     """
+
     @dc.dataclass(frozen=True)
     class Context:
         env: ta.Mapping[str, ta.Any] | None = None

{omlish-0.0.0.dev365.dist-info → omlish-0.0.0.dev366.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev365
+Version: 0.0.0.dev366
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev365.dist-info → omlish-0.0.0.dev366.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=yal4M4IqqPRxe1zOQ3JquQPYH2qkVC_vQZaBVdeABYs,3478
+omlish/__about__.py,sha256=yGFVJ5HaFgcShdvs7RHmReyCjUqPpQc1naBG93xR4oU,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -493,7 +493,7 @@ omlish/logs/timing.py,sha256=qsQ3DB6swts1pxrFlmLWQzhH-3nzDrq1MUu7PxjjUyU,1519
 omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/manifests/base.py,sha256=5CmayiuzdXXv9hB5tDnWqfAosAoEQ26YG0B-emkiTXU,941
-omlish/manifests/load.py,sha256=XYSWJve4dYSaXNO4vSTv5REB6dqJEy9u-S0hoWOx8ko,6661
+omlish/manifests/load.py,sha256=NLpD8eBz078MNjQ9bEafhbpPBPfM_cVQVnkdmtQv7Gk,7666
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=5hQuY-WZ9VMqHZXr-9Dayg380JsnX2vJzXyw6vC6UDs,317
 omlish/marshal/__init__.py,sha256=QeWqXKb6_Jk8vpX9Z-apWlM3nUbJY3uCPOm0k8Lw8b8,3584
@@ -791,7 +791,7 @@ omlish/text/mangle.py,sha256=k7mYavVgxJ2ENV2wfjw3c9u3hqH5NeVpjoxYbyaYC0Y,2796
 omlish/text/minja.py,sha256=eyOA_zUCzyqaBfiPX-hV2xdK9_cqlDEhbVTkZUTZgQo,7521
 omlish/text/parts.py,sha256=MpiCUyfpcL4PLb2Etj8V7Yj4qofhy0xVwBrIL6RfNdg,6646
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
-omlish/text/templating.py,sha256=dUPLXMFFzI2Ep5OhX13z4QXtnhzgNqOmyLkgF5MlFsg,3210
+omlish/text/templating.py,sha256=Nf5BVDgrYBf0WmYwV6SnHPDvl9XVMu8v7MX78pInLTw,3325
 omlish/text/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
 omlish/text/antlr/delimit.py,sha256=wvpZ-FlVoGwRjBALKT1in9cIriIwvyFqmHxgliNJEi8,3472
 omlish/text/antlr/dot.py,sha256=-WHO-xDSv-Ir00TZ4sVIwunKYtZkRveaQ4m5FKj_bRs,962
@@ -872,9 +872,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev365.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev365.dist-info/METADATA,sha256=Iqpr1GKfPFRx-BkzrXQ705YfawXtfqbtyuiCHFm9lxQ,4416
-omlish-0.0.0.dev365.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev365.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev365.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev365.dist-info/RECORD,,
+omlish-0.0.0.dev366.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev366.dist-info/METADATA,sha256=y2efGFNp_VAZoZcZx_Pq7FYHst4s70iopzDtnyHK-F0,4416
+omlish-0.0.0.dev366.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev366.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev366.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev366.dist-info/RECORD,,