v25 上修复了一些Bug

linuxdeepin · Aug 15, 2024 · cd63e97 · cd63e97
1 parent 733da74
commit cd63e97
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ dependencies = [
     "funnylog2",
     "click",
     "pexpect",
-    "fabric",
+#    "fabric",
 ]
 dynamic = ["version"]
 

diff --git a/youqu3/_setting/_setting.py b/youqu3/_setting/_setting.py
@@ -10,7 +10,6 @@ class _Setting(_DynamicSetting):
 
     PASSWORD: str = os.environ.get("PASSWORD") or "1"
 
-    MAX_FAIL = os.environ.get("MAX_FAIL") or 1
     TIMEOUT = os.environ.get("TIMEOUT") or 300
     LOG_LEVEL = os.environ.get("LOG_LEVEL") or "INFO"
     RERUNS = os.environ.get("RERUNS") or 1

diff --git a/youqu3/driver/envx.py b/youqu3/driver/envx.py
@@ -27,7 +27,7 @@ def envx(python_version=None):
             timeout=600
         )
     # youqu3
-    Cmd.run(f'pip3 install youqu3 -i {setting.PYPI_MIRROR}')
+    Cmd.run(f'pip3 install youqu3 -i {setting.PYPI_MIRROR} --break-system-packages')
     # youqu3-cargo
     cli_cmd_creator("youqu3-cargo", 'pipenv run youqu3 "$@"')
     # youqu3-shell
@@ -42,10 +42,10 @@ def envx(python_version=None):
         Cmd.run(f"echo '{path_cmd}' >> ~/.bashrc")
         Cmd.run("source ~/.bashrc")
     # pipenv
-    Cmd.run(f'pip3 install pipenv -i {setting.PYPI_MIRROR}')
+    Cmd.run(f'pip3 install pipenv -i {setting.PYPI_MIRROR} --break-system-packages')
     Cmd.run(f"cd {rootdir} && pipenv --python {python_version}")
     os.system(
-        f"cd {rootdir} && pipenv run pip install -r requirements.txt -i {setting.PYPI_MIRROR}",
+        f"cd {rootdir} && pipenv run pip install -r requirements.txt -i {setting.PYPI_MIRROR} --break-system-packages",
     )
 
 

diff --git a/youqu3/driver/run.py b/youqu3/driver/run.py
@@ -121,7 +121,6 @@ def generate_cmd(self):
             ])
 
         cmd.extend([
-            f"--maxfail={setting.MAX_FAIL}",
             f"--reruns={setting.RERUNS}",
             f"--timeout={setting.TIMEOUT}",
         ])
@@ -204,7 +203,7 @@ def gen_html(self):
                 with open(f"{self.allure_html_path}/{report_dirname}.txt", "w", encoding="utf-8") as f:
                     f.write(report_server_url)
             except ImportError:
-                ...
+                print("only json report")
 
 
 if __name__ == "__main__":