From 79d19bfc41e24534a95e1435e1fda480277017ed Mon Sep 17 00:00:00 2001 From: Sylvain <35365065+sanderegg@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:43:21 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20E2E:=20provide=20a=20requi?= =?UTF-8?q?rements=20file=20without=20playwright=20installed=20(#7050)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/e2e-playwright/requirements/Makefile | 2 + tests/e2e-playwright/requirements/_test.in | 16 +--- tests/e2e-playwright/requirements/_test.txt | 96 +++++++++++++------ .../requirements/_test_wo_playwright.in | 15 +++ .../requirements/_test_wo_playwright.txt | 93 ++++++++++++++++++ tests/e2e-playwright/requirements/_tools.txt | 2 +- .../requirements/ci_wo_playwright.txt | 2 + 7 files changed, 183 insertions(+), 43 deletions(-) create mode 100644 tests/e2e-playwright/requirements/_test_wo_playwright.in create mode 100644 tests/e2e-playwright/requirements/_test_wo_playwright.txt create mode 100644 tests/e2e-playwright/requirements/ci_wo_playwright.txt diff --git a/tests/e2e-playwright/requirements/Makefile b/tests/e2e-playwright/requirements/Makefile index 3f25442b790..3913ba64454 100644 --- a/tests/e2e-playwright/requirements/Makefile +++ b/tests/e2e-playwright/requirements/Makefile @@ -4,3 +4,5 @@ include ../../../requirements/base.Makefile # Add here any extra explicit dependency: e.g. _migration.txt: _base.txt + +_test.txt: _test_wo_playwright.txt diff --git a/tests/e2e-playwright/requirements/_test.in b/tests/e2e-playwright/requirements/_test.in index b3fd9442f78..dc8e0c89dc3 100644 --- a/tests/e2e-playwright/requirements/_test.in +++ b/tests/e2e-playwright/requirements/_test.in @@ -1,16 +1,4 @@ -# intra-repo required dependencies -# --requirement ../../../packages/models-library/requirements/_base.in -# NOTE: should be used once this is pydantic V2 comptible +# this only adds playwright +--requirement _test_wo_playwright.txt -arrow -docker -faker -pydantic[email] -pytest-html -pytest-instafail pytest-playwright -pytest-runner -pytest-sugar -pyyaml -tenacity -httpx diff --git a/tests/e2e-playwright/requirements/_test.txt b/tests/e2e-playwright/requirements/_test.txt index a20b172a3be..e348aba59d1 100644 --- a/tests/e2e-playwright/requirements/_test.txt +++ b/tests/e2e-playwright/requirements/_test.txt @@ -1,60 +1,86 @@ annotated-types==0.7.0 - # via pydantic + # via + # -r requirements/_test_wo_playwright.txt + # pydantic anyio==4.8.0 - # via httpx + # via + # -r requirements/_test_wo_playwright.txt + # httpx arrow==1.3.0 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt certifi==2024.12.14 # via + # -r requirements/_test_wo_playwright.txt # httpcore # httpx # requests charset-normalizer==3.4.1 - # via requests + # via + # -r requirements/_test_wo_playwright.txt + # requests dnspython==2.7.0 - # via email-validator + # via + # -r requirements/_test_wo_playwright.txt + # email-validator docker==7.1.0 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt email-validator==2.2.0 - # via pydantic + # via -r requirements/_test_wo_playwright.txt faker==33.3.1 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt greenlet==3.1.1 # via playwright h11==0.14.0 - # via httpcore + # via + # -r requirements/_test_wo_playwright.txt + # httpcore httpcore==1.0.7 - # via httpx + # via + # -r requirements/_test_wo_playwright.txt + # httpx httpx==0.28.1 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt idna==3.10 # via + # -r requirements/_test_wo_playwright.txt # anyio # email-validator # httpx # requests iniconfig==2.0.0 - # via pytest + # via + # -r requirements/_test_wo_playwright.txt + # pytest jinja2==3.1.5 - # via pytest-html + # via + # -r requirements/_test_wo_playwright.txt + # pytest-html markupsafe==3.0.2 - # via jinja2 + # via + # -r requirements/_test_wo_playwright.txt + # jinja2 packaging==24.2 # via + # -r requirements/_test_wo_playwright.txt # pytest # pytest-sugar playwright==1.49.1 # via pytest-playwright pluggy==1.5.0 - # via pytest + # via + # -r requirements/_test_wo_playwright.txt + # pytest pydantic==2.10.5 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt pydantic-core==2.27.2 - # via pydantic + # via + # -r requirements/_test_wo_playwright.txt + # pydantic pyee==12.0.0 # via playwright pytest==8.3.4 # via + # -r requirements/_test_wo_playwright.txt # pytest-base-url # pytest-html # pytest-instafail @@ -64,43 +90,56 @@ pytest==8.3.4 pytest-base-url==2.1.0 # via pytest-playwright pytest-html==4.1.1 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt pytest-instafail==0.5.0 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt pytest-metadata==3.1.1 - # via pytest-html + # via + # -r requirements/_test_wo_playwright.txt + # pytest-html pytest-playwright==0.6.2 # via -r requirements/_test.in pytest-runner==6.0.1 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt pytest-sugar==1.0.0 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt python-dateutil==2.9.0.post0 # via + # -r requirements/_test_wo_playwright.txt # arrow # faker python-slugify==8.0.4 # via pytest-playwright pyyaml==6.0.2 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt requests==2.32.3 # via + # -r requirements/_test_wo_playwright.txt # docker # pytest-base-url six==1.17.0 - # via python-dateutil + # via + # -r requirements/_test_wo_playwright.txt + # python-dateutil sniffio==1.3.1 - # via anyio + # via + # -r requirements/_test_wo_playwright.txt + # anyio tenacity==9.0.0 - # via -r requirements/_test.in + # via -r requirements/_test_wo_playwright.txt termcolor==2.5.0 - # via pytest-sugar + # via + # -r requirements/_test_wo_playwright.txt + # pytest-sugar text-unidecode==1.3 # via python-slugify types-python-dateutil==2.9.0.20241206 - # via arrow + # via + # -r requirements/_test_wo_playwright.txt + # arrow typing-extensions==4.12.2 # via + # -r requirements/_test_wo_playwright.txt # anyio # faker # pydantic @@ -108,5 +147,6 @@ typing-extensions==4.12.2 # pyee urllib3==2.3.0 # via + # -r requirements/_test_wo_playwright.txt # docker # requests diff --git a/tests/e2e-playwright/requirements/_test_wo_playwright.in b/tests/e2e-playwright/requirements/_test_wo_playwright.in new file mode 100644 index 00000000000..8f3e54f5490 --- /dev/null +++ b/tests/e2e-playwright/requirements/_test_wo_playwright.in @@ -0,0 +1,15 @@ +# intra-repo required dependencies +# --requirement ../../../packages/models-library/requirements/_base.in +# NOTE: should be used once this is pydantic V2 comptible + +arrow +docker +faker +httpx +pydantic[email] +pytest-html +pytest-instafail +pytest-runner +pytest-sugar +pyyaml +tenacity diff --git a/tests/e2e-playwright/requirements/_test_wo_playwright.txt b/tests/e2e-playwright/requirements/_test_wo_playwright.txt new file mode 100644 index 00000000000..7a33b3ca2bd --- /dev/null +++ b/tests/e2e-playwright/requirements/_test_wo_playwright.txt @@ -0,0 +1,93 @@ +annotated-types==0.7.0 + # via pydantic +anyio==4.8.0 + # via httpx +arrow==1.3.0 + # via -r requirements/_test_wo_playwright.in +certifi==2024.12.14 + # via + # httpcore + # httpx + # requests +charset-normalizer==3.4.1 + # via requests +dnspython==2.7.0 + # via email-validator +docker==7.1.0 + # via -r requirements/_test_wo_playwright.in +email-validator==2.2.0 + # via pydantic +faker==33.3.1 + # via -r requirements/_test_wo_playwright.in +h11==0.14.0 + # via httpcore +httpcore==1.0.7 + # via httpx +httpx==0.28.1 + # via -r requirements/_test_wo_playwright.in +idna==3.10 + # via + # anyio + # email-validator + # httpx + # requests +iniconfig==2.0.0 + # via pytest +jinja2==3.1.5 + # via pytest-html +markupsafe==3.0.2 + # via jinja2 +packaging==24.2 + # via + # pytest + # pytest-sugar +pluggy==1.5.0 + # via pytest +pydantic==2.10.5 + # via -r requirements/_test_wo_playwright.in +pydantic-core==2.27.2 + # via pydantic +pytest==8.3.4 + # via + # pytest-html + # pytest-instafail + # pytest-metadata + # pytest-sugar +pytest-html==4.1.1 + # via -r requirements/_test_wo_playwright.in +pytest-instafail==0.5.0 + # via -r requirements/_test_wo_playwright.in +pytest-metadata==3.1.1 + # via pytest-html +pytest-runner==6.0.1 + # via -r requirements/_test_wo_playwright.in +pytest-sugar==1.0.0 + # via -r requirements/_test_wo_playwright.in +python-dateutil==2.9.0.post0 + # via + # arrow + # faker +pyyaml==6.0.2 + # via -r requirements/_test_wo_playwright.in +requests==2.32.3 + # via docker +six==1.17.0 + # via python-dateutil +sniffio==1.3.1 + # via anyio +tenacity==9.0.0 + # via -r requirements/_test_wo_playwright.in +termcolor==2.5.0 + # via pytest-sugar +types-python-dateutil==2.9.0.20241206 + # via arrow +typing-extensions==4.12.2 + # via + # anyio + # faker + # pydantic + # pydantic-core +urllib3==2.3.0 + # via + # docker + # requests diff --git a/tests/e2e-playwright/requirements/_tools.txt b/tests/e2e-playwright/requirements/_tools.txt index 014eb93e2fc..1a58b64d441 100644 --- a/tests/e2e-playwright/requirements/_tools.txt +++ b/tests/e2e-playwright/requirements/_tools.txt @@ -63,7 +63,7 @@ pyyaml==6.0.2 # -c requirements/../../../requirements/constraints.txt # -c requirements/_test.txt # pre-commit -ruff==0.9.1 +ruff==0.9.2 # via -r requirements/../../../requirements/devenv.txt setuptools==75.8.0 # via pip-tools diff --git a/tests/e2e-playwright/requirements/ci_wo_playwright.txt b/tests/e2e-playwright/requirements/ci_wo_playwright.txt new file mode 100644 index 00000000000..c0cbad44edc --- /dev/null +++ b/tests/e2e-playwright/requirements/ci_wo_playwright.txt @@ -0,0 +1,2 @@ +--requirement _test_wo_playwright.txt +pytest-simcore @ ../../packages/pytest-simcore