Skip to content

Commit 6c19a6a

Browse files
authored
Merge branch 'master' into feature/rentals-table
2 parents a5edcd9 + 79d19bf commit 6c19a6a

File tree

7 files changed

+183
-43
lines changed

7 files changed

+183
-43
lines changed

tests/e2e-playwright/requirements/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
include ../../../requirements/base.Makefile
55

66
# Add here any extra explicit dependency: e.g. _migration.txt: _base.txt
7+
8+
_test.txt: _test_wo_playwright.txt
Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
# intra-repo required dependencies
2-
# --requirement ../../../packages/models-library/requirements/_base.in
3-
# NOTE: should be used once this is pydantic V2 comptible
1+
# this only adds playwright
2+
--requirement _test_wo_playwright.txt
43

5-
arrow
6-
docker
7-
faker
8-
pydantic[email]
9-
pytest-html
10-
pytest-instafail
114
pytest-playwright
12-
pytest-runner
13-
pytest-sugar
14-
pyyaml
15-
tenacity
16-
httpx
Lines changed: 68 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,86 @@
11
annotated-types==0.7.0
2-
# via pydantic
2+
# via
3+
# -r requirements/_test_wo_playwright.txt
4+
# pydantic
35
anyio==4.8.0
4-
# via httpx
6+
# via
7+
# -r requirements/_test_wo_playwright.txt
8+
# httpx
59
arrow==1.3.0
6-
# via -r requirements/_test.in
10+
# via -r requirements/_test_wo_playwright.txt
711
certifi==2024.12.14
812
# via
13+
# -r requirements/_test_wo_playwright.txt
914
# httpcore
1015
# httpx
1116
# requests
1217
charset-normalizer==3.4.1
13-
# via requests
18+
# via
19+
# -r requirements/_test_wo_playwright.txt
20+
# requests
1421
dnspython==2.7.0
15-
# via email-validator
22+
# via
23+
# -r requirements/_test_wo_playwright.txt
24+
# email-validator
1625
docker==7.1.0
17-
# via -r requirements/_test.in
26+
# via -r requirements/_test_wo_playwright.txt
1827
email-validator==2.2.0
19-
# via pydantic
28+
# via -r requirements/_test_wo_playwright.txt
2029
faker==33.3.1
21-
# via -r requirements/_test.in
30+
# via -r requirements/_test_wo_playwright.txt
2231
greenlet==3.1.1
2332
# via playwright
2433
h11==0.14.0
25-
# via httpcore
34+
# via
35+
# -r requirements/_test_wo_playwright.txt
36+
# httpcore
2637
httpcore==1.0.7
27-
# via httpx
38+
# via
39+
# -r requirements/_test_wo_playwright.txt
40+
# httpx
2841
httpx==0.28.1
29-
# via -r requirements/_test.in
42+
# via -r requirements/_test_wo_playwright.txt
3043
idna==3.10
3144
# via
45+
# -r requirements/_test_wo_playwright.txt
3246
# anyio
3347
# email-validator
3448
# httpx
3549
# requests
3650
iniconfig==2.0.0
37-
# via pytest
51+
# via
52+
# -r requirements/_test_wo_playwright.txt
53+
# pytest
3854
jinja2==3.1.5
39-
# via pytest-html
55+
# via
56+
# -r requirements/_test_wo_playwright.txt
57+
# pytest-html
4058
markupsafe==3.0.2
41-
# via jinja2
59+
# via
60+
# -r requirements/_test_wo_playwright.txt
61+
# jinja2
4262
packaging==24.2
4363
# via
64+
# -r requirements/_test_wo_playwright.txt
4465
# pytest
4566
# pytest-sugar
4667
playwright==1.49.1
4768
# via pytest-playwright
4869
pluggy==1.5.0
49-
# via pytest
70+
# via
71+
# -r requirements/_test_wo_playwright.txt
72+
# pytest
5073
pydantic==2.10.5
51-
# via -r requirements/_test.in
74+
# via -r requirements/_test_wo_playwright.txt
5275
pydantic-core==2.27.2
53-
# via pydantic
76+
# via
77+
# -r requirements/_test_wo_playwright.txt
78+
# pydantic
5479
pyee==12.0.0
5580
# via playwright
5681
pytest==8.3.4
5782
# via
83+
# -r requirements/_test_wo_playwright.txt
5884
# pytest-base-url
5985
# pytest-html
6086
# pytest-instafail
@@ -64,49 +90,63 @@ pytest==8.3.4
6490
pytest-base-url==2.1.0
6591
# via pytest-playwright
6692
pytest-html==4.1.1
67-
# via -r requirements/_test.in
93+
# via -r requirements/_test_wo_playwright.txt
6894
pytest-instafail==0.5.0
69-
# via -r requirements/_test.in
95+
# via -r requirements/_test_wo_playwright.txt
7096
pytest-metadata==3.1.1
71-
# via pytest-html
97+
# via
98+
# -r requirements/_test_wo_playwright.txt
99+
# pytest-html
72100
pytest-playwright==0.6.2
73101
# via -r requirements/_test.in
74102
pytest-runner==6.0.1
75-
# via -r requirements/_test.in
103+
# via -r requirements/_test_wo_playwright.txt
76104
pytest-sugar==1.0.0
77-
# via -r requirements/_test.in
105+
# via -r requirements/_test_wo_playwright.txt
78106
python-dateutil==2.9.0.post0
79107
# via
108+
# -r requirements/_test_wo_playwright.txt
80109
# arrow
81110
# faker
82111
python-slugify==8.0.4
83112
# via pytest-playwright
84113
pyyaml==6.0.2
85-
# via -r requirements/_test.in
114+
# via -r requirements/_test_wo_playwright.txt
86115
requests==2.32.3
87116
# via
117+
# -r requirements/_test_wo_playwright.txt
88118
# docker
89119
# pytest-base-url
90120
six==1.17.0
91-
# via python-dateutil
121+
# via
122+
# -r requirements/_test_wo_playwright.txt
123+
# python-dateutil
92124
sniffio==1.3.1
93-
# via anyio
125+
# via
126+
# -r requirements/_test_wo_playwright.txt
127+
# anyio
94128
tenacity==9.0.0
95-
# via -r requirements/_test.in
129+
# via -r requirements/_test_wo_playwright.txt
96130
termcolor==2.5.0
97-
# via pytest-sugar
131+
# via
132+
# -r requirements/_test_wo_playwright.txt
133+
# pytest-sugar
98134
text-unidecode==1.3
99135
# via python-slugify
100136
types-python-dateutil==2.9.0.20241206
101-
# via arrow
137+
# via
138+
# -r requirements/_test_wo_playwright.txt
139+
# arrow
102140
typing-extensions==4.12.2
103141
# via
142+
# -r requirements/_test_wo_playwright.txt
104143
# anyio
105144
# faker
106145
# pydantic
107146
# pydantic-core
108147
# pyee
109148
urllib3==2.3.0
110149
# via
150+
# -r requirements/_test_wo_playwright.txt
111151
# docker
112152
# requests
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# intra-repo required dependencies
2+
# --requirement ../../../packages/models-library/requirements/_base.in
3+
# NOTE: should be used once this is pydantic V2 comptible
4+
5+
arrow
6+
docker
7+
faker
8+
httpx
9+
pydantic[email]
10+
pytest-html
11+
pytest-instafail
12+
pytest-runner
13+
pytest-sugar
14+
pyyaml
15+
tenacity
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
annotated-types==0.7.0
2+
# via pydantic
3+
anyio==4.8.0
4+
# via httpx
5+
arrow==1.3.0
6+
# via -r requirements/_test_wo_playwright.in
7+
certifi==2024.12.14
8+
# via
9+
# httpcore
10+
# httpx
11+
# requests
12+
charset-normalizer==3.4.1
13+
# via requests
14+
dnspython==2.7.0
15+
# via email-validator
16+
docker==7.1.0
17+
# via -r requirements/_test_wo_playwright.in
18+
email-validator==2.2.0
19+
# via pydantic
20+
faker==33.3.1
21+
# via -r requirements/_test_wo_playwright.in
22+
h11==0.14.0
23+
# via httpcore
24+
httpcore==1.0.7
25+
# via httpx
26+
httpx==0.28.1
27+
# via -r requirements/_test_wo_playwright.in
28+
idna==3.10
29+
# via
30+
# anyio
31+
# email-validator
32+
# httpx
33+
# requests
34+
iniconfig==2.0.0
35+
# via pytest
36+
jinja2==3.1.5
37+
# via pytest-html
38+
markupsafe==3.0.2
39+
# via jinja2
40+
packaging==24.2
41+
# via
42+
# pytest
43+
# pytest-sugar
44+
pluggy==1.5.0
45+
# via pytest
46+
pydantic==2.10.5
47+
# via -r requirements/_test_wo_playwright.in
48+
pydantic-core==2.27.2
49+
# via pydantic
50+
pytest==8.3.4
51+
# via
52+
# pytest-html
53+
# pytest-instafail
54+
# pytest-metadata
55+
# pytest-sugar
56+
pytest-html==4.1.1
57+
# via -r requirements/_test_wo_playwright.in
58+
pytest-instafail==0.5.0
59+
# via -r requirements/_test_wo_playwright.in
60+
pytest-metadata==3.1.1
61+
# via pytest-html
62+
pytest-runner==6.0.1
63+
# via -r requirements/_test_wo_playwright.in
64+
pytest-sugar==1.0.0
65+
# via -r requirements/_test_wo_playwright.in
66+
python-dateutil==2.9.0.post0
67+
# via
68+
# arrow
69+
# faker
70+
pyyaml==6.0.2
71+
# via -r requirements/_test_wo_playwright.in
72+
requests==2.32.3
73+
# via docker
74+
six==1.17.0
75+
# via python-dateutil
76+
sniffio==1.3.1
77+
# via anyio
78+
tenacity==9.0.0
79+
# via -r requirements/_test_wo_playwright.in
80+
termcolor==2.5.0
81+
# via pytest-sugar
82+
types-python-dateutil==2.9.0.20241206
83+
# via arrow
84+
typing-extensions==4.12.2
85+
# via
86+
# anyio
87+
# faker
88+
# pydantic
89+
# pydantic-core
90+
urllib3==2.3.0
91+
# via
92+
# docker
93+
# requests

tests/e2e-playwright/requirements/_tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pyyaml==6.0.2
6363
# -c requirements/../../../requirements/constraints.txt
6464
# -c requirements/_test.txt
6565
# pre-commit
66-
ruff==0.9.1
66+
ruff==0.9.2
6767
# via -r requirements/../../../requirements/devenv.txt
6868
setuptools==75.8.0
6969
# via pip-tools
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--requirement _test_wo_playwright.txt
2+
pytest-simcore @ ../../packages/pytest-simcore

0 commit comments

Comments
 (0)