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

dekshell/core/contexts/methods.py

@@ -15,7 +15,7 @@ from dektools.file import sure_dir, write_file, read_text, remove_path, sure_par
     format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty, \
     read_lines, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, path_parent, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
-    iter_dir_type, iter_dir_type_one, rc4_file, \
+    iter_dir_type, iter_dir_type_one, rc4_file, iter_relative_path, \
     where, which, those
 from dektools.venvx.active import activate_venv, is_venv_active
 from dektools.venvx.tools import find_venv_path, is_venv_path
@@ -321,6 +321,7 @@ default_methods = {
 
         'lsa': iter_dir_type,
         'lso': lambda path='.', file=None: iter_dir_type_one(path, file, ''),
+        'lsr': iter_relative_path,
         'ls': lambda x='.': os.listdir(x),
 
         'iglob': iglob,

dekshell/core/markers/pip_.py

@@ -1,24 +1,13 @@
 from dektools.file import write_file, remove_path
-from ...utils.pkg import get_installed_distributions_map, is_dist_installed
 from .base import MarkerWithEnd
 
 
 class PipMarker(MarkerWithEnd):
-    tag_head = "pip"
+    tag_head = "_pip"
 
     def execute(self, context, command, marker_node, marker_set):
-        def walk(node, depth):
-            if depth != 0:
-                for c in node.command.split('||'):
-                    c = c.strip()
-                    if c:
-                        req_list.append(c)
-
-        req_list = []
-        marker_node.walk(walk)
-        dist_map = get_installed_distributions_map()
-        req_list = [req for req in req_list if not is_dist_installed(req, dist_map)]
-        fp = write_file(None, t='\n'.join(req_list))
+        text = self.get_inner_content(context, marker_node, translate=None)
+        fp = write_file(s=text)
         marker_set.shell_cmd(f'pip install -r {fp}')
         remove_path(fp)
         return []

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

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

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

@@ -1,12 +1,12 @@
-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-0.2.58.dist-info/METADATA,sha256=cejpBgr1WD-2N5sjIEh2k_MFpCzNT-sVAa9jOCRVObM,573
+dekshell-0.2.58.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.58.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
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=oBZhmXtSoOBgZPAHu6wiMCCW-yIdkC5mqSXqbvKYUy4,490
-dekshell/core/contexts/methods.py,sha256=-z94TUMKM7a2Jr3GqtXJhLbMMQEWWM0ji33Gfoz3Euk,12284
+dekshell/core/contexts/methods.py,sha256=OngRFg2FTG21RjVvd2kguHbYTSLbmvfYQRof4xk7KNI,12339
 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=CHD9vb8yGjnALimCwZJ2refbPB7zAE4FgQKLoRwzLrE,18037
@@ -24,7 +24,7 @@ dekshell/core/markers/function.py,sha256=j8Cz4ouBQi_0dT6Q6pfJie-1rfIZuSIcWzGBlsK
 dekshell/core/markers/if_.py,sha256=UqEnR0X9bKO7hEKol3MJNWXvP7fuJAGt8zwk3xlBCuk,1118
 dekshell/core/markers/input.py,sha256=94SWaeLnwtxRdIn9Ck0IxMZL6vOXVCedUmsp5IPAwWo,1188
 dekshell/core/markers/invoke.py,sha256=ESL2DE9DTaq33AnrXpvEudp1qtoeZFKOhLL12OQpcs0,1975
-dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
+dekshell/core/markers/pip_.py,sha256=kQjXy57YPFqCpryO_6F5v51g49DprMAAJp-eWdptpFU,408
 dekshell/core/markers/redirect.py,sha256=-w_qhdaHa1hIi-LjCmXpaYKZWrTitAiSawjEf8qjYt4,1989
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
 dekshell/core/markers/var.py,sha256=yA2T8dq4vbfyeaV1KOUt3YZp51WTC623NviMAJTOdOQ,8182
@@ -37,4 +37,4 @@ 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.56.dist-info/RECORD,,
+dekshell-0.2.58.dist-info/RECORD,,