Skip to content

Commit dc50bdf

Browse files
dosaboydosaboy
committed
Cleanup Master CI
* update: - charmcraft.yaml for v3 - tox.ini to use py3.12 by default - test-requirements.in to use zaza for juju3 - update test bundles to work with charmcraft v3 * generate: - merged-requirements-py312.txt - test-requirements-py312.txt * add: - update-requirements env to tox.ini and src/tox.ini Change-Id: Ida2e8f511fc0df0e72ff021c5fa43bec7c784ba9 Signed-off-by: Edward Hope-Morley <edward.hope-morley@canonical.com>
1 parent fa716fc commit dc50bdf

10 files changed

Lines changed: 1069 additions & 65 deletions

‎charmcraft.yaml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parts:
44
charm:
55
plugin: reactive
66
reactive-charm-build-arguments:
7+
- --verbose
78
- --binary-wheels-from-source
89
build-packages:
910
- tox
@@ -15,21 +16,12 @@ parts:
1516
- cargo
1617
source: src/
1718
build-snaps:
18-
- charm/latest/edge
19+
- charm/3.x/stable
1920
build-environment:
2021
- CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
2122
- CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
22-
base: ubuntu@24.04
2323
platforms:
24-
amd64:
25-
build-on: amd64
26-
build-for: amd64
27-
arm64:
28-
build-on: arm64
29-
build-for: arm64
30-
ppc64el:
31-
build-on: ppc64el
32-
build-for: ppc64el
33-
s390x:
34-
build-on: s390x
35-
build-for: s390x
24+
ubuntu@24.04:amd64:
25+
ubuntu@24.04:arm64:
26+
ubuntu@24.04:ppc64el:
27+
ubuntu@24.04:s390x:

‎merged-requirements-py312.txt‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.12
3+
# by the following command:
4+
#
5+
# pip-compile --output-file=merged-requirements-py312.txt --unsafe-package=juju --unsafe-package=kubernetes requirements.in test-requirements.in
6+
#
7+
attrs==26.1.0
8+
# via jsonschema
9+
blessings==1.7
10+
# via charm-tools
11+
certifi==2026.5.20
12+
# via requests
13+
cffi==2.0.0
14+
# via cryptography
15+
charm-tools @ git+https://github.com/juju/charm-tools.git
16+
# via -r requirements.in
17+
charmhelpers==1.2.1
18+
# via charms-reactive
19+
charms-openstack @ git+https://github.com/openstack/charms.openstack.git
20+
# via -r test-requirements.in
21+
charms-reactive==1.5.3
22+
# via -r test-requirements.in
23+
charset-normalizer==3.4.7
24+
# via requests
25+
cheetah3==3.2.6.post1
26+
# via charm-tools
27+
cliff==2.18.0
28+
# via
29+
# -r test-requirements.in
30+
# stestr
31+
cmd2==0.8.9
32+
# via cliff
33+
colander==1.8.3
34+
# via charm-tools
35+
coverage==7.14.1
36+
# via -r test-requirements.in
37+
cryptography==3.3.2
38+
# via
39+
# -r test-requirements.in
40+
# secretstorage
41+
dict2colander==0.2
42+
# via charm-tools
43+
distlib==0.4.2
44+
# via virtualenv
45+
filelock==3.29.1
46+
# via virtualenv
47+
fixtures==4.3.2
48+
# via stestr
49+
flake8==7.1.1
50+
# via -r test-requirements.in
51+
hvac==2.4.0
52+
# via -r test-requirements.in
53+
idna==3.18
54+
# via requests
55+
iso8601==2.1.0
56+
# via
57+
# colander
58+
# python-subunit
59+
jaraco-classes==3.4.0
60+
# via keyring
61+
jeepney==0.9.0
62+
# via
63+
# keyring
64+
# secretstorage
65+
jinja2==3.1.6
66+
# via charmhelpers
67+
jsonschema==4.17.3
68+
# via charm-tools
69+
jujubundlelib==0.5.7
70+
# via charm-tools
71+
keyring==23.13.1
72+
# via charm-tools
73+
lxml==6.1.1
74+
# via -r test-requirements.in
75+
markupsafe==3.0.3
76+
# via jinja2
77+
mccabe==0.7.0
78+
# via flake8
79+
mock==5.2.0
80+
# via -r test-requirements.in
81+
more-itertools==11.1.0
82+
# via jaraco-classes
83+
netaddr==1.3.0
84+
# via charmhelpers
85+
netifaces==0.11.0
86+
# via -r test-requirements.in
87+
nose==1.3.7
88+
# via -r test-requirements.in
89+
otherstuf==1.1.0
90+
# via charm-tools
91+
parse==1.22.1
92+
# via stuf
93+
path==16.16.0
94+
# via charm-tools
95+
pathspec==0.10.3
96+
# via charm-tools
97+
pbr==5.6.0
98+
# via
99+
# -r test-requirements.in
100+
# charmhelpers
101+
# cliff
102+
pip==26.1.2
103+
# via charm-tools
104+
platformdirs==4.10.0
105+
# via virtualenv
106+
prettytable==0.7.2
107+
# via cliff
108+
psutil==7.2.2
109+
# via -r test-requirements.in
110+
psycopg2-binary==2.9.12
111+
# via -r test-requirements.in
112+
pyaml==26.2.1
113+
# via charms-reactive
114+
pycodestyle==2.12.1
115+
# via flake8
116+
pycparser==3.0
117+
# via cffi
118+
pyflakes==3.2.0
119+
# via flake8
120+
pyparsing==2.4.7
121+
# via
122+
# -r test-requirements.in
123+
# cliff
124+
# cmd2
125+
pyperclip==1.11.0
126+
# via cmd2
127+
pyrsistent==0.20.0
128+
# via jsonschema
129+
python-subunit==1.4.6
130+
# via stestr
131+
pyyaml==6.0.3
132+
# via
133+
# charm-tools
134+
# charmhelpers
135+
# cliff
136+
# jujubundlelib
137+
# pyaml
138+
# python-subunit
139+
# stestr
140+
requests==2.34.2
141+
# via
142+
# -r test-requirements.in
143+
# charm-tools
144+
# hvac
145+
requirements-parser==0.5.0
146+
# via charm-tools
147+
ruamel-yaml==0.17.40
148+
# via charm-tools
149+
ruamel-yaml-clib==0.2.15
150+
# via ruamel-yaml
151+
secretstorage==3.3.3
152+
# via
153+
# charm-tools
154+
# keyring
155+
setuptools==81.0.0
156+
# via
157+
# -r test-requirements.in
158+
# charm-tools
159+
# colander
160+
simplejson==4.1.1
161+
# via -r requirements.in
162+
six==1.17.0
163+
# via
164+
# blessings
165+
# cliff
166+
# cmd2
167+
# cryptography
168+
stestr==4.2.1
169+
# via -r test-requirements.in
170+
stevedore==5.8.0
171+
# via cliff
172+
stuf==0.9.16
173+
# via otherstuf
174+
tenacity==9.1.4
175+
# via -r test-requirements.in
176+
testtools==2.9.1
177+
# via
178+
# python-subunit
179+
# stestr
180+
tomlkit==0.15.0
181+
# via stestr
182+
translationstring==1.4
183+
# via colander
184+
types-setuptools==82.0.0.20260518
185+
# via requirements-parser
186+
urllib3==2.7.0
187+
# via requests
188+
virtualenv==20.39.1
189+
# via charm-tools
190+
voluptuous==0.16.0
191+
# via stestr
192+
wcwidth==0.8.1
193+
# via cmd2

requirements.txt renamed to requirements.in

File renamed without changes.

0 commit comments

Comments
 (0)