dekshell 0.2.54__py3-none-any.whl → 0.2.56__py3-none-any.whl

dekshell/core/markers/base/__init__.py

@@ -1,7 +1,7 @@
 import re
 import functools
 from dektools.str import deep_format, split_table_line, shlex_split, shlex_quote
-from dektools.common import classproperty
+from dektools.common import cached_classproperty
 from dektools.shell import shell_output, shell_wrapper, shell_exitcode
 from dektools.escape import str_escape_custom
 from ....utils.serializer import serializer
@@ -234,10 +234,9 @@ class MarkerBase:
         else:
             return evaluate(expression, default_value)
 
-    @classproperty
-    @functools.lru_cache(None)
-    def final_branch_set(cls):
-        return {cls if x is None else x for x in cls.branch_set}
+    @cached_classproperty
+    def final_branch_set(self):
+        return {self if x is None else x for x in self.branch_set}
 
     @staticmethod
     def get_item(array, index, default=None):

dekshell/core/redirect.py

@@ -2,6 +2,7 @@ import os
 import sys
 from dektools.sys import sys_paths_relative
 from dektools.file import normal_path, which
+from dektools.venvx.tools import find_venv_path
 from ..utils.shell import shell_name
 
 
@@ -11,16 +12,15 @@ def search_bin_by_path_tree(filepath, bin_name=None, skip_self=True):
     filepath = normal_path(filepath)
     cursor = os.path.dirname(filepath) if os.path.isfile(filepath) else filepath
     while True:
-        for venv_name in ('venv', 'env', '.venv'):
-            path_venv = os.path.join(cursor, venv_name)
-            if os.path.isdir(path_venv):
-                if skip_self and sys.prefix == path_venv:
-                    return
-                else:
-                    path_scripts = sys_paths_relative(path_venv)['scripts']
-                    path_exe = which(bin_name, path_scripts)
-                    if path_exe:
-                        return path_exe
+        path_venv = find_venv_path(cursor)
+        if path_venv:
+            if skip_self and sys.prefix == path_venv:
+                return None
+            else:
+                path_scripts = sys_paths_relative(path_venv)['scripts']
+                path_exe = which(bin_name, path_scripts)
+                if path_exe:
+                    return path_exe
         dir_cursor = os.path.dirname(cursor)
         if dir_cursor == cursor:
             break

{dekshell-0.2.54.dist-info → dekshell-0.2.56.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.54
+Version: 0.2.56
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.54.dist-info → dekshell-0.2.56.dist-info}/RECORD

@@ -1,6 +1,6 @@
-dekshell-0.2.54.dist-info/METADATA,sha256=2bryNp80_nweXUE1Gj3Tr5wD3kNW_rIkCjtKfA9kODQ,573
-dekshell-0.2.54.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.54.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.56.dist-info/METADATA,sha256=HREUIaOb3eOMmKiFCq_Tz14Ik6OFWIjm59hzrv5rPbw,573
+dekshell-0.2.56.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.56.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
@@ -9,7 +9,7 @@ dekshell/core/contexts/__init__.py,sha256=oBZhmXtSoOBgZPAHu6wiMCCW-yIdkC5mqSXqbv
 dekshell/core/contexts/methods.py,sha256=-z94TUMKM7a2Jr3GqtXJhLbMMQEWWM0ji33Gfoz3Euk,12284
 dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
 dekshell/core/markers/__init__.py,sha256=1oq4wlBOJV56hsshPe0ZZZMvoItCV2Xs2RN08HTrbiY,2255
-dekshell/core/markers/base/__init__.py,sha256=0LYnOVNXPBHfRQII00ZGkESTFX82TgHdSaTcHJoebXc,18051
+dekshell/core/markers/base/__init__.py,sha256=CHD9vb8yGjnALimCwZJ2refbPB7zAE4FgQKLoRwzLrE,18037
 dekshell/core/markers/base/core.py,sha256=5TYAg7JWX58669RBUOMgJxCUMuOARPDL7GENNtNAYls,12558
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
@@ -30,11 +30,11 @@ dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vha
 dekshell/core/markers/var.py,sha256=yA2T8dq4vbfyeaV1KOUt3YZp51WTC623NviMAJTOdOQ,8182
 dekshell/core/markers/while_.py,sha256=Q0SaElyXSrxg-wS_rfCcxMsmw9jf-0SgN1ICn860T4A,1201
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
-dekshell/core/redirect.py,sha256=jgLdcPtc4RKs63Lf2I0LXJRr9jRfNu03aDB_tIWvcrU,1117
+dekshell/core/redirect.py,sha256=BTaEMRcKgaLG0j0lUc0QvEYRyaY4QUKboAbOJUqdQfw,1059
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/utils/beep.py,sha256=teuQgHbWDr8BD1xCJ4Pt79X6N1-eq1tTlyGunK6wBIM,120
 dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.54.dist-info/RECORD,,
+dekshell-0.2.56.dist-info/RECORD,,