From cd63e977b734e43a7fa8b5faf4499972805fc8f8 Mon Sep 17 00:00:00 2001 From: mikigo Date: Thu, 15 Aug 2024 11:03:52 +0800 Subject: [PATCH] =?UTF-8?q?v25=20=E4=B8=8A=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=BA=9BBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- youqu3/_setting/_setting.py | 1 - youqu3/driver/envx.py | 6 +++--- youqu3/driver/run.py | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 355d2541..f1d49bfd 100644 --- 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 index 3735ca5d..456bcd69 100644 --- 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 index 6ec00bd0..e17368f6 100644 --- 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 index cb4bd670..cfe9ce18 100644 --- 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__":