zrb 0.14.0__py3-none-any.whl → 0.14.1__py3-none-any.whl

zrb/helper/cli.py

@@ -46,12 +46,12 @@ def create_cli() -> click.Group:
     # Load zrb_init.py
     project_dir = os.getenv("ZRB_PROJECT_DIR", os.getcwd())
     project_script = os.path.join(project_dir, "zrb_init.py")
-    load_module(script_path=project_script)
+    load_module(script_path=project_script, sys_path_index=0)
     # load from ZRB_INIT_SCRIPTS environment
-    for init_script in init_scripts:
+    for index, init_script in enumerate(init_scripts):
         logger.info(colored(f"Load module from {init_script}", attrs=["dark"]))
         try:
-            load_module(script_path=init_script)
+            load_module(script_path=init_script, sys_path_index=index + 1)
         except Exception:
             logger.error(
                 colored(

zrb/helper/loader/load_module.py

@@ -13,11 +13,11 @@ pattern = re.compile("[^a-zA-Z0-9]")
 
 @lru_cache
 @typechecked
-def load_module(script_path: str):
+def load_module(script_path: str, sys_path_index: int = 0):
     if not os.path.isfile(script_path):
         return
     script_dir_path = os.path.dirname(script_path)
-    _append_dir_to_sys_path(script_dir_path)
+    _append_dir_to_sys_path(script_dir_path, sys_path_index)
     _append_dir_to_python_path(script_dir_path)
     _exec_script_as_module(script_path)
 
@@ -33,8 +33,10 @@ def _exec_script_as_module(script_path: str):
     logger.info(colored(f"Module executed: {script_path}", attrs=["dark"]))
 
 
-def _append_dir_to_sys_path(dir_path: str):
-    sys.path.append(dir_path)
+def _append_dir_to_sys_path(dir_path: str, index: int):
+    if dir_path in sys.path:
+        return
+    sys.path.insert(index, dir_path)
     logger.info(colored(f"Set sys.path to {sys.path}", attrs=["dark"]))
 
 
@@ -48,4 +50,6 @@ def _get_new_python_path(dir_path: str) -> str:
     current_python_path = os.getenv("PYTHONPATH")
     if current_python_path is None or current_python_path == "":
         return dir_path
+    if dir_path in current_python_path.split(":"):
+        return current_python_path
     return ":".join([current_python_path, dir_path])

{zrb-0.14.0.dist-info → zrb-0.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.14.0
+Version: 0.14.1
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-0.14.0.dist-info → zrb-0.14.1.dist-info}/RECORD

@@ -1302,7 +1302,7 @@ zrb/helper/accessories/icon.py,sha256=G35OlUlVh0su-ch61cZzP6U9VQvTjjeH64vmGxKiMV
 zrb/helper/accessories/name.py,sha256=An2nsmLHKRuL5HjqXUpj9Wy9ozjhh0GyHM6PlTruKK8,1477
 zrb/helper/advertisement.py,sha256=AvjjkKjKpNnepu1IZ-qnYLr__fHIu5g1Tj3zJnjuCMY,787
 zrb/helper/callable.py,sha256=2s2ra1iekRP5QZc2IVqAi6sQHnWb8Hnqy8FwDgfDaFQ,231
-zrb/helper/cli.py,sha256=AEIrt8urzpZaWWLiubffw2JU0rfGOogCrU65En8kMKA,2050
+zrb/helper/cli.py,sha256=4qDGdx8qT1WlgSV1_YtKvE_9LH0A0YLwTjykam-K-T8,2112
 zrb/helper/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/codemod/add_argument_to_function.py,sha256=KrXOYXrhaFuKCZt4cwN_epjX4qd-L0d0ZNKlhLDF-t0,1252
 zrb/helper/codemod/add_argument_to_function_call.py,sha256=MclDAFBeG4idUfVWtxOFDZmqHdM1HAJNA-tTP56jahs,998
@@ -1327,7 +1327,7 @@ zrb/helper/file/text.py,sha256=ylyDwacsMv9cce0N7SsAMhAgwGOuaPKXl5vxUsBIGXc,809
 zrb/helper/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/git/detect_changes.py,sha256=CwL_GIfINAouNj95hXVJ-JqFtWu7Ha8lhPJj-qkJLXc,1150
 zrb/helper/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/helper/loader/load_module.py,sha256=BpZc0MHmqoGazjhhsdV4N578qcv6ZF1ZWlME7_FUakI,1728
+zrb/helper/loader/load_module.py,sha256=qyzG2oHSEfzL0LgB3wBfH4k4xi22I4mdcGWsWl5g4uM,1918
 zrb/helper/log.py,sha256=_5wYGO-hKeJhebD7rj_7tkmY0xmONbwKnMB-a3iOI_o,517
 zrb/helper/map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/helper/map/conversion.py,sha256=4oz_JJNygnR_pq4KZKrHpG0PNd7v2axbrgAzGvC-A30,444
@@ -1398,8 +1398,8 @@ zrb/task_input/int_input.py,sha256=NVXAToqgdmWVwDqnr3XGuvq_QMNvUiIdD-pW5L4uebk,4
 zrb/task_input/password_input.py,sha256=5sS3XP7WtGow7r7Fid8J9SX0iNCidO6Bg7q40UpZDM0,4029
 zrb/task_input/str_input.py,sha256=D2WBeB-CdmAuOSzT7jTXvie7X3EK_m_Oq8_SVwmNpWA,4042
 zrb/task_input/task_input.py,sha256=L-U5dX-I2U5ci7GU226Q8pXcQe5SpGuOl5viFwlfiM0,2022
-zrb-0.14.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.14.0.dist-info/METADATA,sha256=P4oQWcQeuQmjY0wh0mKqBP0WhjVja9W-MFgGL2XqQ8Q,16460
-zrb-0.14.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.14.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.14.0.dist-info/RECORD,,
+zrb-0.14.1.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.14.1.dist-info/METADATA,sha256=zj-IJGtw1CkPysw7x4aQ3lw5wtaXmskOHD13Vg61MPQ,16460
+zrb-0.14.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.14.1.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.14.1.dist-info/RECORD,,