Skip to content

Commit 163ed5a

Browse files
mbuechsembuechse
committed
move iaas/kaas-specific requirements to respective subfolder
Signed-off-by: Matthias Büchse <[email protected]>
1 parent da924d8 commit 163ed5a

File tree

8 files changed

+145
-91
lines changed

8 files changed

+145
-91
lines changed

‎Tests/Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ WORKDIR /scs-compliance
77
COPY requirements.txt requirements.txt
88
RUN pip3 install -r requirements.txt
99

10+
COPY iaas/requirements.txt iaas-requirements.txt
11+
RUN pip3 install -r iaas-requirements.txt
12+
13+
COPY kaas/requirements.txt kaas-requirements.txt
14+
RUN pip3 install -r kaas-requirements.txt
15+
1016
COPY . .
1117

1218
ENTRYPOINT ["./scs-compliance-check.py"]

‎Tests/iaas/requirements.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
boto3
2+
openstacksdk

‎Tests/iaas/requirements.txt‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile requirements.in
6+
#
7+
boto3==1.38.17
8+
# via -r requirements.in
9+
botocore==1.38.17
10+
# via
11+
# boto3
12+
# s3transfer
13+
certifi==2025.4.26
14+
# via requests
15+
cffi==1.17.1
16+
# via cryptography
17+
charset-normalizer==3.4.2
18+
# via requests
19+
cryptography==44.0.3
20+
# via openstacksdk
21+
decorator==5.2.1
22+
# via
23+
# dogpile-cache
24+
# openstacksdk
25+
dogpile-cache==1.4.0
26+
# via openstacksdk
27+
idna==3.10
28+
# via requests
29+
iso8601==2.1.0
30+
# via
31+
# keystoneauth1
32+
# openstacksdk
33+
jmespath==1.0.1
34+
# via
35+
# boto3
36+
# botocore
37+
# openstacksdk
38+
jsonpatch==1.33
39+
# via openstacksdk
40+
jsonpointer==3.0.0
41+
# via jsonpatch
42+
keystoneauth1==5.11.0
43+
# via openstacksdk
44+
openstacksdk==4.5.0
45+
# via -r requirements.in
46+
os-service-types==1.7.0
47+
# via
48+
# keystoneauth1
49+
# openstacksdk
50+
pbr==6.1.1
51+
# via
52+
# keystoneauth1
53+
# openstacksdk
54+
# os-service-types
55+
# stevedore
56+
platformdirs==4.3.8
57+
# via openstacksdk
58+
psutil==7.0.0
59+
# via openstacksdk
60+
pycparser==2.22
61+
# via cffi
62+
python-dateutil==2.9.0.post0
63+
# via botocore
64+
pyyaml==6.0.2
65+
# via openstacksdk
66+
requests==2.32.3
67+
# via keystoneauth1
68+
requestsexceptions==1.4.0
69+
# via openstacksdk
70+
s3transfer==0.12.0
71+
# via boto3
72+
six==1.17.0
73+
# via python-dateutil
74+
stevedore==5.4.1
75+
# via
76+
# dogpile-cache
77+
# keystoneauth1
78+
typing-extensions==4.13.2
79+
# via
80+
# keystoneauth1
81+
# openstacksdk
82+
urllib3==2.4.0
83+
# via
84+
# botocore
85+
# requests
86+
87+
# The following packages are considered to be unsafe in a requirements file:
88+
# setuptools

‎Tests/kaas/requirements.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pytest-kind
22
kubernetes
3+
kubernetes_asyncio
34
jinja2
45
junitparser

‎Tests/kaas/requirements.txt‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,55 @@
44
#
55
# pip-compile requirements.in
66
#
7+
aiohappyeyeballs==2.6.1
8+
# via aiohttp
9+
aiohttp==3.11.18
10+
# via kubernetes-asyncio
11+
aiosignal==1.3.2
12+
# via aiohttp
13+
attrs==25.3.0
14+
# via aiohttp
715
cachetools==5.5.0
816
# via google-auth
917
certifi==2024.8.30
1018
# via
1119
# kubernetes
20+
# kubernetes-asyncio
1221
# requests
1322
charset-normalizer==3.3.2
1423
# via requests
24+
frozenlist==1.6.0
25+
# via
26+
# aiohttp
27+
# aiosignal
1528
google-auth==2.34.0
1629
# via kubernetes
1730
idna==3.8
18-
# via requests
31+
# via
32+
# requests
33+
# yarl
1934
jinja2==3.1.6
2035
# via -r requirements.in
2136
junitparser==3.2.0
2237
# via -r requirements.in
2338
kubernetes==30.1.0
2439
# via -r requirements.in
40+
kubernetes-asyncio==32.3.2
41+
# via -r requirements.in
2542
markupsafe==3.0.2
2643
# via jinja2
44+
multidict==6.4.3
45+
# via
46+
# aiohttp
47+
# yarl
2748
oauthlib==3.2.2
2849
# via
2950
# kubernetes
3051
# requests-oauthlib
52+
propcache==0.3.1
53+
# via
54+
# aiohttp
55+
# yarl
3156
pyasn1==0.6.0
3257
# via
3358
# pyasn1-modules
@@ -39,10 +64,13 @@ pykube-ng==23.6.0
3964
pytest-kind==22.11.1
4065
# via -r requirements.in
4166
python-dateutil==2.9.0.post0
42-
# via kubernetes
67+
# via
68+
# kubernetes
69+
# kubernetes-asyncio
4370
pyyaml==6.0.2
4471
# via
4572
# kubernetes
73+
# kubernetes-asyncio
4674
# pykube-ng
4775
requests==2.32.3
4876
# via
@@ -56,11 +84,15 @@ rsa==4.9
5684
six==1.16.0
5785
# via
5886
# kubernetes
87+
# kubernetes-asyncio
5988
# python-dateutil
6089
urllib3==2.2.2
6190
# via
6291
# kubernetes
92+
# kubernetes-asyncio
6393
# pykube-ng
6494
# requests
6595
websocket-client==1.8.0
6696
# via kubernetes
97+
yarl==1.20.0
98+
# via aiohttp

‎Tests/requirements.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
aiohttp
2-
boto3 # TODO: move into iaas/requirements.in
32
click
4-
kubernetes_asyncio # TODO: move into kaas/requirements.in
53
python-dateutil
64
PyYAML
7-
openstacksdk # TODO: move into iaas/requirements.in
85
requests
96
sslyze
107
tomli

‎Tests/requirements.txt‎

Lines changed: 9 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,26 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --output-file=requirements.txt requirements.in
5+
# pip-compile requirements.in
66
#
77
aiohappyeyeballs==2.3.5
88
# via aiohttp
99
aiohttp==3.10.11
10-
# via
11-
# -r requirements.in
12-
# kubernetes-asyncio
10+
# via -r requirements.in
1311
aiosignal==1.3.1
1412
# via aiohttp
1513
attrs==24.2.0
1614
# via aiohttp
17-
boto3==1.35.65
18-
# via -r requirements.in
19-
botocore==1.35.65
20-
# via
21-
# boto3
22-
# s3transfer
2315
certifi==2024.7.4
24-
# via
25-
# kubernetes-asyncio
26-
# requests
16+
# via requests
2717
cffi==1.17.0
2818
# via cryptography
2919
charset-normalizer==3.3.2
3020
# via requests
3121
click==8.1.7
3222
# via -r requirements.in
3323
cryptography==44.0.1
34-
# via
35-
# openstacksdk
36-
# sslyze
37-
decorator==5.1.1
38-
# via
39-
# dogpile-cache
40-
# openstacksdk
41-
dogpile-cache==1.3.3
42-
# via openstacksdk
24+
# via sslyze
4325
frozenlist==1.4.1
4426
# via
4527
# aiohttp
@@ -48,85 +30,31 @@ idna==3.7
4830
# via
4931
# requests
5032
# yarl
51-
iso8601==2.1.0
52-
# via
53-
# keystoneauth1
54-
# openstacksdk
55-
jmespath==1.0.1
56-
# via
57-
# boto3
58-
# botocore
59-
# openstacksdk
60-
jsonpatch==1.33
61-
# via openstacksdk
62-
jsonpointer==3.0.0
63-
# via jsonpatch
64-
keystoneauth1==5.7.0
65-
# via openstacksdk
66-
kubernetes-asyncio==30.3.1
67-
# via -r requirements.in
6833
multidict==6.0.5
6934
# via
7035
# aiohttp
7136
# yarl
7237
nassl==1.0.3
7338
# via sslyze
74-
netifaces==0.11.0
75-
# via openstacksdk
76-
openstacksdk==3.3.0
77-
# via -r requirements.in
78-
os-service-types==1.7.0
79-
# via
80-
# keystoneauth1
81-
# openstacksdk
82-
pbr==6.0.0
83-
# via
84-
# keystoneauth1
85-
# openstacksdk
86-
# os-service-types
87-
# stevedore
88-
platformdirs==4.2.2
89-
# via openstacksdk
9039
propcache==0.2.0
9140
# via yarl
9241
pycparser==2.22
9342
# via cffi
9443
python-dateutil==2.9.0.post0
95-
# via
96-
# -r requirements.in
97-
# botocore
98-
# kubernetes-asyncio
44+
# via -r requirements.in
9945
pyyaml==6.0.2
100-
# via
101-
# -r requirements.in
102-
# kubernetes-asyncio
103-
# openstacksdk
46+
# via -r requirements.in
10447
requests==2.32.3
105-
# via
106-
# -r requirements.in
107-
# keystoneauth1
108-
requestsexceptions==1.4.0
109-
# via openstacksdk
110-
s3transfer==0.10.3
111-
# via boto3
48+
# via -r requirements.in
11249
six==1.16.0
113-
# via
114-
# kubernetes-asyncio
115-
# python-dateutil
50+
# via python-dateutil
11651
sslyze==1.3.4
11752
# via -r requirements.in
118-
stevedore==5.2.0
119-
# via
120-
# dogpile-cache
121-
# keystoneauth1
12253
tls-parser==1.2.2
12354
# via sslyze
12455
tomli==2.0.1
12556
# via -r requirements.in
12657
urllib3==2.2.2
127-
# via
128-
# botocore
129-
# kubernetes-asyncio
130-
# requests
58+
# via requests
13159
yarl==1.17.2
13260
# via aiohttp

‎playbooks/pre_cloud.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
- role: bindep # https://zuul-ci.org/docs/zuul-jobs/latest/general-roles.html#role-bindep
66
- role: ensure-pip # https://zuul-ci.org/docs/zuul-jobs/latest/python-roles.html#role-ensure-pip
77
tasks:
8-
# - name: Install iaas dependencies
9-
# ansible.builtin.pip:
10-
# chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
11-
# requirements: "Tests/iaas/requirements.txt"
12-
# when: iaas | bool
8+
- name: Install iaas dependencies
9+
ansible.builtin.pip:
10+
chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
11+
requirements: "Tests/iaas/requirements.txt"
12+
when: iaas | bool
1313

1414
- name: Install kaas dependencies
1515
ansible.builtin.pip:

0 commit comments

Comments
 (0)