Update tox.ini and re-generate requirements

tox.ini needs to have env for specific Python versions as this
is needed by the CI Zuul jobs, e.g., py310, py312 etc. Since we
are using the same CI cleanup procedure as with other charms,
this may also modify requirements files, so we re-generate
them to be sure they are in sync.

Change-Id: Ic9ce79a02488fc40127acb8db9c2f7774fccfcee
Signed-off-by: Munir Siddiqui <munir.siddiqui@canonical.com>

merged-requirements-py312.txt

@@ -41,9 +41,9 @@ cryptography==3.3.2
     #   secretstorage
 dict2colander==0.2
     # via charm-tools
-distlib==0.4.0
+distlib==0.4.1
     # via virtualenv
-filelock==3.29.0
+filelock==3.29.1
     # via virtualenv
 fixtures==4.3.2
     # via stestr
@@ -51,7 +51,7 @@ flake8==7.1.1
     # via -r test-requirements.in
 hvac==2.4.0
     # via -r test-requirements.in
-idna==3.17
+idna==3.18
     # via requests
 iso8601==2.1.0
     # via
@@ -103,7 +103,7 @@ pbr==5.6.0
     # via
     #   -r test-requirements.in
     #   charmhelpers
-pip==26.1.1
+pip==26.1.2
     # via charm-tools
 platformdirs==4.10.0
     # via virtualenv

src/test-requirements-py310.txt

@@ -1,12 +1,12 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=test-requirements-py312.txt --unsafe-package=juju --unsafe-package=kubernetes --unsafe-package=websockets test-requirements.in
+#    pip-compile --output-file=test-requirements-py310.txt --unsafe-package=juju --unsafe-package=kubernetes --unsafe-package=websockets test-requirements.in
 #
 aiohappyeyeballs==2.6.2
     # via aiohttp
-aiohttp==3.13.5
+aiohttp==3.14.0
     # via
     #   python-libmaas
     #   zaza
@@ -20,6 +20,8 @@ async-generator==1.10
     # via
     #   zaza
     #   zaza-openstack
+async-timeout==5.0.1
+    # via aiohttp
 attrs==26.1.0
     # via
     #   aiohttp
@@ -36,13 +38,17 @@ babel==2.18.0
     #   python-openstackclient
 backports-datetime-fromisoformat==2.0.3
     # via juju
+backports-strenum==1.3.1
+    # via
+    #   cmd2
+    #   juju
 bcrypt==5.0.0
     # via paramiko
 blessings==1.7
     # via charm-tools
-boto3==1.43.17
+boto3==1.43.22
     # via zaza-openstack
-botocore==1.43.17
+botocore==1.43.22
     # via
     #   boto3
     #   s3transfer
@@ -108,7 +114,7 @@ decorator==5.3.1
     #   python-magnumclient
 dict2colander==0.2
     # via charm-tools
-distlib==0.4.0
+distlib==0.4.1
     # via virtualenv
 dnspython==2.8.0
     # via
@@ -120,7 +126,7 @@ dogpile-cache==1.5.0
     #   python-ironicclient
 fasteners==0.20
     # via oslo-concurrency
-filelock==3.29.0
+filelock==3.29.1
     # via virtualenv
 frozenlist==1.8.0
     # via
@@ -139,11 +145,13 @@ hvac==0.6.4
     #   juju
     #   zaza
     #   zaza-openstack
-idna==3.17
+idna==3.18
     # via
     #   requests
     #   trustme
     #   yarl
+importlib-metadata==9.0.0
+    # via keyring
 invoke==3.0.3
     # via paramiko
 iso8601==2.1.0
@@ -251,7 +259,7 @@ oauthlib==3.3.1
     #   kubernetes
     #   python-libmaas
     #   requests-oauthlib
-openstacksdk==4.14.0
+openstacksdk==4.13.0
     # via
     #   os-client-config
     #   osc-lib
@@ -405,7 +413,7 @@ pbr==7.0.3
     #   python-watcherclient
 pika==1.4.1
     # via zaza-openstack
-pip==26.1.1
+pip==26.1.2
     # via charm-tools
 platformdirs==4.10.0
     # via
@@ -661,12 +669,18 @@ types-setuptools==82.0.0.20260518
     # via requirements-parser
 typing-extensions==4.15.0
     # via
+    #   aiohttp
     #   aiosignal
+    #   cmd2
+    #   dogpile-cache
     #   juju
     #   keystoneauth1
+    #   multidict
+    #   openstacksdk
     #   os-service-types
     #   oslo-context
     #   typing-inspect
+    #   virtualenv
 typing-inspect==0.9.0
     # via juju
 ujson==5.12.1
@@ -680,7 +694,7 @@ virtualenv==20.39.1
     # via charm-tools
 warlock==2.1.0
     # via python-glanceclient
-webob==1.8.9
+webob==1.8.10
     # via osprofiler
 websocket-client==1.9.0
     # via kubernetes
@@ -696,6 +710,8 @@ zaza==2024.1.1
     #   zaza-openstack
 zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git
     # via -r test-requirements.in
+zipp==4.1.0
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # juju

src/tox.ini

@@ -12,7 +12,7 @@ sitepackages = False
 skip_missing_interpreters = False
 
 [testenv]
-basepython = python3.12
+basepython = python3.10
 # We use tox mainly for virtual environment management for test requirements
 # and do not install the charm code as a Python package into that environment.
 # Ref: https://tox.wiki/en/latest/config.html#skip_install
@@ -28,13 +28,13 @@ passenv =
     TEST_*
 deps =
     -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza/master/constraints-juju36.txt}
-    -r{toxinidir}/test-requirements-py312.txt
+    -r{toxinidir}/test-requirements-py310.txt
 
 [testenv:update-requirements]
-basepython = python3.12
+basepython = python3.10
 deps = pip-tools
 commands =
-    pip-compile --unsafe-package juju --unsafe-package kubernetes --unsafe-package websockets --output-file=test-requirements-py312.txt test-requirements.in
+    pip-compile --unsafe-package juju --unsafe-package kubernetes --unsafe-package websockets --output-file=test-requirements-py310.txt test-requirements.in
 
 [testenv:pep8]
 commands = charm-proof

test-requirements-py312.txt

@@ -32,7 +32,7 @@ flake8==7.1.1
     # via -r test-requirements.in
 hvac==2.4.0
     # via -r test-requirements.in
-idna==3.17
+idna==3.18
     # via requests
 iso8601==2.1.0
     # via python-subunit

tox.ini

@@ -63,6 +63,9 @@ commands =
 [testenv:py3]
 commands = stestr run --slowest {posargs}
 
+[testenv:py312]
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 deps = -r {toxinidir}/test-requirements-py312.txt
 commands = flake8 {posargs} src unit_tests