omlish 0.0.0.dev408__py3-none-any.whl → 0.0.0.dev409__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev408'
-__revision__ = '5d4bd94d19abed3d89f070bc4748ab16aed6c9dc'
+__version__ = '0.0.0.dev409'
+__revision__ = '9ee675d7bba914e838f5f8ce55dc0af32638a52c'
 
 
 #

omlish/lang/__init__.py

@@ -237,7 +237,7 @@ from .imports.proxyinit import (  # noqa
     auto_proxy_init,
 )
 
-from .imports.resolution import (  # noqa
+from .imports.resolving import (  # noqa
     can_import,
     get_real_module_name,
     resolve_import_name,

omlish/lang/imports/conditional.py

@@ -1,6 +1,6 @@
 import sys
 
-from .resolution import resolve_import_name
+from .resolving import resolve_import_name
 
 
 ##

omlish/manifests/loading.py

@@ -209,6 +209,7 @@ class ManifestLoader:
     @classmethod
     def _discover_packages_uncached(cls) -> ta.Sequence[str]:
         from importlib import metadata as importlib_metadata  # noqa
+
         return [
             ep.value
             for ep in importlib_metadata.entry_points(group=cls.ENTRY_POINT_GROUP)
@@ -262,35 +263,31 @@ class ManifestLoader:
 
     ##
 
-    _detected_packages: ta.Set[str]
-
-    def _do_initialize(self) -> None:
-        self._detected_packages = set()
+    def _detect_packages_uncached(self) -> ta.AbstractSet[str]:
+        ret: ta.Set[str] = set()
 
         for r in self._config.package_scan_root_dirs or []:
-            self._detected_packages.update(self._scan_package_root_dir_locked(r))
+            ret.update(self._scan_package_root_dir_locked(r))
 
         if self._config.discover_packages:
-            self._detected_packages.update(dps := self.discover_packages())
+            ret.update(dps := self.discover_packages())
             if not dps:
                 for r in self._config.discover_packages_fallback_scan_root_dirs or []:
-                    self._detected_packages.update(self._scan_package_root_dir_locked(r))
+                    ret.update(self._scan_package_root_dir_locked(r))
 
-    _has_initialized = False
+        return ret
 
-    def _initialize_locked(self) -> None:
-        if not self._has_initialized:
-            self._do_initialize()
-            self._has_initialized = True
+    _detected_packages: ta.Optional[ta.AbstractSet[str]] = None
 
-    def has_initialized(self) -> bool:
-        with self._lock:
-            return self._has_initialized
+    def _detect_packages_locked(self) -> ta.AbstractSet[str]:
+        if self._detected_packages is None:
+            self._detected_packages = self._detect_packages_uncached()
 
-    def initialize(self) -> None:
-        if not self._has_initialized:
-            with self._lock:
-                self._initialize_locked()
+        return self._detected_packages
+
+    def detect_packages(self) -> ta.AbstractSet[str]:
+        with self._lock:
+            return self._detect_packages_locked()
 
     ##
 
@@ -429,6 +426,7 @@ class ManifestLoader:
                     return f.read()
 
         from importlib import resources as importlib_resources  # noqa
+
         t = importlib_resources.files(package_name).joinpath(file_name)
         if not t.is_file():
             return None
@@ -497,7 +495,7 @@ class ManifestLoader:
 
     ##
 
-    def _load_initialized(
+    def _load_locked(
             self,
             *,
             packages: ta.Optional[ta.Collection[str]] = None,
@@ -511,7 +509,7 @@ class ManifestLoader:
             class_keys = {self.get_class_key(cls) for cls in classes}
 
         if packages is None:
-            packages = self._detected_packages
+            packages = self._detect_packages_locked()
 
         lst: ta.List[ManifestLoader.LoadedManifest] = []
         for pn in packages:
@@ -527,18 +525,6 @@ class ManifestLoader:
 
         return lst
 
-    def _load_locked(
-            self,
-            *,
-            packages: ta.Optional[ta.Collection[str]] = None,
-            classes: ta.Optional[ta.Collection[type]] = None,
-    ) -> ta.Sequence[LoadedManifest]:
-        self._initialize_locked()
-        return self._load_initialized(
-            packages=packages,
-            classes=classes,
-        )
-
     def load(
             self,
             *,

{omlish-0.0.0.dev408.dist-info → omlish-0.0.0.dev409.dist-info}/METADATA

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

{omlish-0.0.0.dev408.dist-info → omlish-0.0.0.dev409.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=uoNyxmEJL6Is-2YBuCTc7ay-o0M0jllCRS1Wi5csIrc,3601
+omlish/__about__.py,sha256=4QkSZDk0KGwNDUXL28RW4dosDTkKwvPxAM7iBzddM4g,3601
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -426,7 +426,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=M16LXrJhMdsz5ea2qH0vws30ZvhQuQSCVFSLpRf_gTg,2096
 omlish/iterators/unique.py,sha256=BSE-eanva8byFCJi09Nt2zzTsVr8LnTqY1PIInGYRs0,1396
-omlish/lang/__init__.py,sha256=le8N_Hj6ahtWnG6-gGEo53CK270rDA9wuhh6rUDS9ws,7232
+omlish/lang/__init__.py,sha256=7Xe1YcE2PPgx-NI-V9VTsvUl4qZD0RPANxuDv9ddRXg,7231
 omlish/lang/attrs.py,sha256=zFiVuGVOq88x45464T_LxDa-ZEq_RD9zJLq2zeVEBDc,5105
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -464,10 +464,10 @@ omlish/lang/classes/restrict.py,sha256=CUyvLpMYiQwTjpzo5sdG_lQxdeEIq2z2xSVNrsI9K
 omlish/lang/classes/simple.py,sha256=9blmJdi4c15zyIEbNVjkA0ZTSImQbv4g0p2Il6knWAc,2539
 omlish/lang/classes/virtual.py,sha256=z0MYQD9Q5MkX8DzF325wDB4J9XoYbsB09jZ1omC62To,3366
 omlish/lang/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/imports/conditional.py,sha256=qxHYlE_xuwPJb6F9K8upagHxuYL0APPLWRVo5079Ipg,1007
+omlish/lang/imports/conditional.py,sha256=R-E47QD95mMonPImWlrde3rnJrFKCCkYz71c94W05sc,1006
 omlish/lang/imports/lazy.py,sha256=Fhtb5tSAttff6G2pZdF8bh__GZlqJWHaMKtA8KubuX4,1479
 omlish/lang/imports/proxyinit.py,sha256=ALpV9LahE8SQl6jNO92Mk4PcaQPce9Cv53K8AwnH5fQ,16749
-omlish/lang/imports/resolution.py,sha256=DeRarn35Fryg5JhVhy8wbiC9lvr58AnllI9B_reswUE,2085
+omlish/lang/imports/resolving.py,sha256=DeRarn35Fryg5JhVhy8wbiC9lvr58AnllI9B_reswUE,2085
 omlish/lang/imports/traversal.py,sha256=pbFQIa880NGjSfcLsno2vE_G41_CLwDHb-7gWg2J3BI,2855
 omlish/lifecycles/__init__.py,sha256=1FjYceXs-4fc-S-C9zFYmc2axHs4znnQHcJVHdY7a6E,578
 omlish/lifecycles/abstract.py,sha256=c9UY7oxzYZ_neh5DPE4yv5HfuDv7B4Mj_9Zo-B8KDSs,1114
@@ -520,7 +520,7 @@ omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/manifests/base.py,sha256=Dt44a3qppWaxkoi3naFFMetxbxw14qnz2naTKK93GNU,915
 omlish/manifests/globals.py,sha256=kVqQ-fT4kc7xWzLHoI731GviitFPv2v2yqw-p7t7Exs,2628
-omlish/manifests/loading.py,sha256=guLx-3y4rqQ2YIgTtqlpCk59inePtcEUE19JrWDzleM,17639
+omlish/manifests/loading.py,sha256=Br1OyI23pis_FfYju9xoacms608lzB1Zh_IqdVw_7vg,17201
 omlish/manifests/static.py,sha256=9BaPBLkuzxHmg5A-5k9BjjBFINCdmFOIu06dMFgCfz4,497
 omlish/manifests/types.py,sha256=NeOGuIVrcbqjCDbQ3MnCxxHAgHnw0CkWJsBzo230PWE,453
 omlish/marshal/.dataclasses.json,sha256=wXWUy_IR8AolAa2RQnqn_mo2QnmVcvUJmayIykdVl0I,22
@@ -909,9 +909,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.dev408.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev408.dist-info/METADATA,sha256=Qr8WqkJANqZkuNa9T-p-EbysqP66teV_LtOK3df82pw,18881
-omlish-0.0.0.dev408.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev408.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev408.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev408.dist-info/RECORD,,
+omlish-0.0.0.dev409.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev409.dist-info/METADATA,sha256=fCzoIaINPTeVtCOvdUmzuUWQqKIGW40xgEmeKO4bIxg,18881
+omlish-0.0.0.dev409.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev409.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev409.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev409.dist-info/RECORD,,