Skip to content

Commit 08886bd

Browse files
committed
Bugfix: add constraints to layers to prevent conflicts
thx @martinmo for help! Signed-off-by: Matthias Büchse <[email protected]>
1 parent 2ea63b3 commit 08886bd

File tree

6 files changed

+66
-18
lines changed

6 files changed

+66
-18
lines changed

Tests/iaas/requirements.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
-c ../requirements.txt
12
boto3
23
openstacksdk

Tests/iaas/requirements.txt

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,31 @@ botocore==1.38.20
1111
# boto3
1212
# s3transfer
1313
certifi==2025.4.26
14-
# via requests
14+
# via
15+
# -c ../requirements.txt
16+
# requests
1517
cffi==1.17.1
16-
# via cryptography
18+
# via
19+
# -c ../requirements.txt
20+
# cryptography
1721
charset-normalizer==3.4.2
18-
# via requests
19-
cryptography==45.0.2
20-
# via openstacksdk
22+
# via
23+
# -c ../requirements.txt
24+
# requests
25+
cryptography==44.0.3
26+
# via
27+
# -c ../requirements.txt
28+
# openstacksdk
2129
decorator==5.2.1
2230
# via
2331
# dogpile-cache
2432
# openstacksdk
2533
dogpile-cache==1.4.0
2634
# via openstacksdk
2735
idna==3.10
28-
# via requests
36+
# via
37+
# -c ../requirements.txt
38+
# requests
2939
iso8601==2.1.0
3040
# via
3141
# keystoneauth1
@@ -58,29 +68,41 @@ platformdirs==4.3.8
5868
psutil==7.0.0
5969
# via openstacksdk
6070
pycparser==2.22
61-
# via cffi
71+
# via
72+
# -c ../requirements.txt
73+
# cffi
6274
python-dateutil==2.9.0.post0
63-
# via botocore
75+
# via
76+
# -c ../requirements.txt
77+
# botocore
6478
pyyaml==6.0.2
65-
# via openstacksdk
79+
# via
80+
# -c ../requirements.txt
81+
# openstacksdk
6682
requests==2.32.3
67-
# via keystoneauth1
83+
# via
84+
# -c ../requirements.txt
85+
# keystoneauth1
6886
requestsexceptions==1.4.0
6987
# via openstacksdk
7088
s3transfer==0.12.0
7189
# via boto3
7290
six==1.17.0
73-
# via python-dateutil
91+
# via
92+
# -c ../requirements.txt
93+
# python-dateutil
7494
stevedore==5.4.1
7595
# via
7696
# dogpile-cache
7797
# keystoneauth1
7898
typing-extensions==4.13.2
7999
# via
100+
# -c ../requirements.txt
80101
# keystoneauth1
81102
# openstacksdk
82103
urllib3==2.4.0
83104
# via
105+
# -c ../requirements.txt
84106
# botocore
85107
# requests
86108

Tests/kaas/requirements.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-c ../requirements.txt
12
pytest-kind
23
kubernetes
34
kubernetes_asyncio

Tests/kaas/requirements.txt

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,45 @@
55
# pip-compile requirements.in
66
#
77
aiohappyeyeballs==2.6.1
8-
# via aiohttp
8+
# via
9+
# -c ../requirements.txt
10+
# aiohttp
911
aiohttp==3.11.18
10-
# via kubernetes-asyncio
12+
# via
13+
# -c ../requirements.txt
14+
# kubernetes-asyncio
1115
aiosignal==1.3.2
12-
# via aiohttp
16+
# via
17+
# -c ../requirements.txt
18+
# aiohttp
1319
attrs==25.3.0
14-
# via aiohttp
20+
# via
21+
# -c ../requirements.txt
22+
# aiohttp
1523
cachetools==5.5.2
1624
# via google-auth
1725
certifi==2025.4.26
1826
# via
27+
# -c ../requirements.txt
1928
# kubernetes
2029
# kubernetes-asyncio
2130
# requests
2231
charset-normalizer==3.4.2
23-
# via requests
32+
# via
33+
# -c ../requirements.txt
34+
# requests
2435
durationpy==0.10
2536
# via kubernetes
2637
frozenlist==1.6.0
2738
# via
39+
# -c ../requirements.txt
2840
# aiohttp
2941
# aiosignal
3042
google-auth==2.40.1
3143
# via kubernetes
3244
idna==3.10
3345
# via
46+
# -c ../requirements.txt
3447
# requests
3548
# yarl
3649
jinja2==3.1.6
@@ -45,6 +58,7 @@ markupsafe==3.0.2
4558
# via jinja2
4659
multidict==6.4.4
4760
# via
61+
# -c ../requirements.txt
4862
# aiohttp
4963
# yarl
5064
oauthlib==3.2.2
@@ -53,6 +67,7 @@ oauthlib==3.2.2
5367
# requests-oauthlib
5468
propcache==0.3.1
5569
# via
70+
# -c ../requirements.txt
5671
# aiohttp
5772
# yarl
5873
pyasn1==0.6.1
@@ -67,15 +82,18 @@ pytest-kind==22.11.1
6782
# via -r requirements.in
6883
python-dateutil==2.9.0.post0
6984
# via
85+
# -c ../requirements.txt
7086
# kubernetes
7187
# kubernetes-asyncio
7288
pyyaml==6.0.2
7389
# via
90+
# -c ../requirements.txt
7491
# kubernetes
7592
# kubernetes-asyncio
7693
# pykube-ng
7794
requests==2.32.3
7895
# via
96+
# -c ../requirements.txt
7997
# kubernetes
8098
# pykube-ng
8199
# requests-oauthlib
@@ -85,16 +103,20 @@ rsa==4.9.1
85103
# via google-auth
86104
six==1.17.0
87105
# via
106+
# -c ../requirements.txt
88107
# kubernetes
89108
# kubernetes-asyncio
90109
# python-dateutil
91110
urllib3==2.4.0
92111
# via
112+
# -c ../requirements.txt
93113
# kubernetes
94114
# kubernetes-asyncio
95115
# pykube-ng
96116
# requests
97117
websocket-client==1.8.0
98118
# via kubernetes
99119
yarl==1.20.0
100-
# via aiohttp
120+
# via
121+
# -c ../requirements.txt
122+
# aiohttp

Tests/test-requirements.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
-c requirements.txt
2+
-c iaas/requirements.txt
3+
-c kaas/requirements.txt
24
pytest
35
pytest-asyncio
46
pytest-cov

Tests/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile test-requirements.in
66
#
7-
coverage[toml]==7.8.0
7+
coverage[toml]==7.8.1
88
# via pytest-cov
99
iniconfig==2.1.0
1010
# via pytest

0 commit comments

Comments
 (0)