From 12b89bbb305715209cf9d6efc8f40495c7590782 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 29 Apr 2024 11:16:11 +0100 Subject: [PATCH] Stable changes for stable/2024.1 (caracal) branch This patch converts stable/2024.1 into a stable maintenance branch. It: - modifies .gitreview to point to stable/2024.1 - switches (test-)requirements*.txt -> (test-)requirements*.in for pip-compile usage. - creates (test-)requirements-py*.txt from *.in using pip-compile for the relevant python version. - Updates bundles to point to ceph/edge and 24.04/edge for ceph and OVN charms. - Adds build.lock file to the reactive charms. - Syncs charm-helpers for classic charms. - Locks requirements.txt from requirements.in for ops machine charms. - Locks charms.openstack, zaza, zaza-openstack-tests, charm-helpers to stable branches. Change-Id: If5c80263a4f9eda25b40ba33f03ae6fb9d3063c9 --- .gitreview | 2 + merged-requirements-py310.txt | 204 ++++++ merged-requirements-py311.txt | 204 ++++++ merged-requirements-py38.txt | 212 ++++++ requirements.txt => requirements.in | 0 src/build.lock | 302 ++++++++ src/test-requirements-py38.txt | 657 ++++++++++++++++++ ...-requirements.txt => test-requirements.in} | 4 +- src/tests/bundles/jammy-antelope.yaml | 6 +- src/tests/bundles/jammy-bobcat.yaml | 6 +- src/tests/bundles/jammy-caracal.yaml | 6 +- src/tests/bundles/noble-caracal.yaml | 6 +- src/tox.ini | 22 +- src/wheelhouse.txt | 4 +- test-requirements-py310.txt | 125 ++++ test-requirements-py311.txt | 125 ++++ test-requirements-py38.txt | 125 ++++ test-requirements.txt => test-requirements.in | 2 +- tox.ini | 37 +- 19 files changed, 2004 insertions(+), 45 deletions(-) create mode 100644 merged-requirements-py310.txt create mode 100644 merged-requirements-py311.txt create mode 100644 merged-requirements-py38.txt rename requirements.txt => requirements.in (100%) create mode 100644 src/build.lock create mode 100644 src/test-requirements-py38.txt rename src/{test-requirements.txt => test-requirements.in} (79%) create mode 100644 test-requirements-py310.txt create mode 100644 test-requirements-py311.txt create mode 100644 test-requirements-py38.txt rename test-requirements.txt => test-requirements.in (93%) diff --git a/.gitreview b/.gitreview index cb4941f..be22927 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-manila.git + +defaultbranch=stable/2024.1 diff --git a/merged-requirements-py310.txt b/merged-requirements-py310.txt new file mode 100644 index 0000000..302901a --- /dev/null +++ b/merged-requirements-py310.txt @@ -0,0 +1,204 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=merged-requirements-py310.txt requirements.in test-requirements.in +# +attrs==23.2.0 + # via jsonschema +blessings==1.7 + # via charm-tools +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charm-tools @ git+https://github.com/juju/charm-tools.git + # via -r requirements.in +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cheetah3==3.2.6.post1 + # via charm-tools +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +colander==1.8.3 + # via charm-tools +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # secretstorage +dict2colander==0.2 + # via charm-tools +distlib==0.3.8 + # via virtualenv +extras==1.0.0 + # via + # stestr + # testtools +filelock==3.13.4 + # via virtualenv +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.1.0 + # via -r test-requirements.in +idna==3.7 + # via requests +importlib-metadata==7.1.0 + # via keyring +iso8601==2.1.0 + # via + # colander + # python-subunit +jaraco-classes==3.4.0 + # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.3 + # via charmhelpers +jsonschema==4.17.3 + # via charm-tools +jujubundlelib==0.5.7 + # via charm-tools +keyring==23.13.1 + # via charm-tools +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +more-itertools==10.2.0 + # via jaraco-classes +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +otherstuf==1.1.0 + # via charm-tools +parse==1.20.1 + # via stuf +path==16.14.0 + # via path-py +path-py==12.5.0 + # via charm-tools +pathspec==0.10.3 + # via charm-tools +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +platformdirs==4.2.1 + # via virtualenv +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +pyrsistent==0.20.0 + # via jsonschema +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charm-tools + # charmhelpers + # cliff + # jujubundlelib + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # charm-tools + # hvac +requirements-parser==0.5.0 + # via charm-tools +ruamel-yaml==0.17.40 + # via charm-tools +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +secretstorage==3.3.3 + # via + # charm-tools + # keyring +simplejson==3.19.2 + # via -r requirements.in +six==1.16.0 + # via + # blessings + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +stuf==0.9.16 + # via otherstuf +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +translationstring==1.4 + # via colander +types-setuptools==69.5.0.20240423 + # via requirements-parser +urllib3==2.2.1 + # via requests +vergit==1.0.2 + # via charm-tools +virtualenv==20.26.0 + # via charm-tools +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 +zipp==3.18.1 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/merged-requirements-py311.txt b/merged-requirements-py311.txt new file mode 100644 index 0000000..d095ead --- /dev/null +++ b/merged-requirements-py311.txt @@ -0,0 +1,204 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=merged-requirements-py311.txt requirements.in test-requirements.in +# +attrs==23.2.0 + # via jsonschema +blessings==1.7 + # via charm-tools +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charm-tools @ git+https://github.com/juju/charm-tools.git + # via -r requirements.in +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cheetah3==3.2.6.post1 + # via charm-tools +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +colander==1.8.3 + # via charm-tools +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # secretstorage +dict2colander==0.2 + # via charm-tools +distlib==0.3.8 + # via virtualenv +extras==1.0.0 + # via + # stestr + # testtools +filelock==3.14.0 + # via virtualenv +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.2.0 + # via -r test-requirements.in +idna==3.7 + # via requests +importlib-metadata==7.1.0 + # via keyring +iso8601==2.1.0 + # via + # colander + # python-subunit +jaraco-classes==3.4.0 + # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.3 + # via charmhelpers +jsonschema==4.17.3 + # via charm-tools +jujubundlelib==0.5.7 + # via charm-tools +keyring==23.13.1 + # via charm-tools +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +more-itertools==10.2.0 + # via jaraco-classes +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +otherstuf==1.1.0 + # via charm-tools +parse==1.20.1 + # via stuf +path==16.14.0 + # via path-py +path-py==12.5.0 + # via charm-tools +pathspec==0.10.3 + # via charm-tools +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +platformdirs==4.2.1 + # via virtualenv +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +pyrsistent==0.20.0 + # via jsonschema +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charm-tools + # charmhelpers + # cliff + # jujubundlelib + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # charm-tools + # hvac +requirements-parser==0.5.0 + # via charm-tools +ruamel-yaml==0.17.40 + # via charm-tools +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +secretstorage==3.3.3 + # via + # charm-tools + # keyring +simplejson==3.19.2 + # via -r requirements.in +six==1.16.0 + # via + # blessings + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +stuf==0.9.16 + # via otherstuf +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +translationstring==1.4 + # via colander +types-setuptools==69.5.0.20240423 + # via requirements-parser +urllib3==2.2.1 + # via requests +vergit==1.0.2 + # via charm-tools +virtualenv==20.26.1 + # via charm-tools +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 +zipp==3.18.1 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/merged-requirements-py38.txt b/merged-requirements-py38.txt new file mode 100644 index 0000000..d42e3d1 --- /dev/null +++ b/merged-requirements-py38.txt @@ -0,0 +1,212 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=merged-requirements-py38.txt requirements.in test-requirements.in +# +attrs==23.2.0 + # via jsonschema +blessings==1.7 + # via charm-tools +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charm-tools @ git+https://github.com/juju/charm-tools.git + # via -r requirements.in +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cheetah3==3.2.6.post1 + # via charm-tools +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +colander==1.8.3 + # via charm-tools +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via + # -r test-requirements.in + # secretstorage +dict2colander==0.2 + # via charm-tools +distlib==0.3.8 + # via virtualenv +extras==1.0.0 + # via + # stestr + # testtools +filelock==3.13.4 + # via virtualenv +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.1.0 + # via -r test-requirements.in +idna==3.7 + # via requests +importlib-metadata==7.1.0 + # via keyring +importlib-resources==6.4.0 + # via + # jsonschema + # keyring +iso8601==2.1.0 + # via + # colander + # python-subunit +jaraco-classes==3.4.0 + # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage +jinja2==3.1.3 + # via charmhelpers +jsonschema==4.17.3 + # via charm-tools +jujubundlelib==0.5.7 + # via charm-tools +keyring==23.13.1 + # via charm-tools +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +more-itertools==10.2.0 + # via jaraco-classes +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +otherstuf==1.1.0 + # via charm-tools +parse==1.20.1 + # via stuf +path==16.14.0 + # via path-py +path-py==12.5.0 + # via charm-tools +pathspec==0.10.3 + # via charm-tools +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.2.1 + # via virtualenv +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +pyrsistent==0.20.0 + # via jsonschema +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charm-tools + # charmhelpers + # cliff + # jujubundlelib + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # charm-tools + # hvac +requirements-parser==0.5.0 + # via charm-tools +ruamel-yaml==0.17.40 + # via charm-tools +ruamel-yaml-clib==0.2.8 + # via ruamel-yaml +secretstorage==3.3.3 + # via + # charm-tools + # keyring +simplejson==3.19.2 + # via -r requirements.in +six==1.16.0 + # via + # blessings + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +stuf==0.9.16 + # via otherstuf +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +translationstring==1.4 + # via colander +types-setuptools==69.5.0.20240423 + # via requirements-parser +urllib3==2.2.1 + # via requests +vergit==1.0.2 + # via charm-tools +virtualenv==20.26.0 + # via charm-tools +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 +zipp==3.18.1 + # via + # importlib-metadata + # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/requirements.txt b/requirements.in similarity index 100% rename from requirements.txt rename to requirements.in diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..b2a08b1 --- /dev/null +++ b/src/build.lock @@ -0,0 +1,302 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "1edd5ccd3fb6240ca734b64a7dae9f1cb30b66f6", + "commit": "1edd5ccd3fb6240ca734b64a7dae9f1cb30b66f6" + }, + { + "type": "layer", + "item": "layer:openstack", + "url": "https://github.com/openstack/charm-layer-openstack", + "vcs": null, + "branch": "7c671b0696977f455616565d956895b2f890464b", + "commit": "7c671b0696977f455616565d956895b2f890464b" + }, + { + "type": "layer", + "item": "layer:openstack-principle", + "url": "https://github.com/openstack/charm-layer-openstack-principle", + "vcs": null, + "branch": "2541283a7f9c3fa923c0fccd7257e217e11dadcd", + "commit": "2541283a7f9c3fa923c0fccd7257e217e11dadcd" + }, + { + "type": "layer", + "item": "layer:openstack-api", + "url": "https://github.com/openstack/charm-layer-openstack-api", + "vcs": null, + "branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651", + "commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651" + }, + { + "type": "layer", + "item": "manila", + "url": null, + "vcs": null, + "branch": null, + "commit": "" + }, + { + "type": "layer", + "item": "interface:tls-certificates", + "url": "https://github.com/juju-solutions/interface-tls-certificates", + "vcs": null, + "branch": "da891c403864482688ec767a964218e5857f0e49", + "commit": "da891c403864482688ec767a964218e5857f0e49" + }, + { + "type": "layer", + "item": "interface:mysql-shared", + "url": "https://github.com/openstack/charm-interface-mysql-shared", + "vcs": null, + "branch": "f90f8c6edce21e4da3a872f0f9d6761730ce025d", + "commit": "f90f8c6edce21e4da3a872f0f9d6761730ce025d" + }, + { + "type": "layer", + "item": "interface:rabbitmq", + "url": "https://github.com/openstack/charm-interface-rabbitmq", + "vcs": null, + "branch": "383121fc584d2d3bf9d233eba0d3708398a4c468", + "commit": "383121fc584d2d3bf9d233eba0d3708398a4c468" + }, + { + "type": "layer", + "item": "interface:keystone", + "url": "https://github.com/openstack/charm-interface-keystone", + "vcs": null, + "branch": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a", + "commit": "36ea7b385a569ebabca7184ed4ce8420bb8fa61a" + }, + { + "type": "layer", + "item": "interface:hacluster", + "url": "https://github.com/openstack/charm-interface-hacluster.git", + "vcs": null, + "branch": "d91e83a1fa59a13f4160febfe536c68dc762e436", + "commit": "d91e83a1fa59a13f4160febfe536c68dc762e436" + }, + { + "type": "layer", + "item": "interface:openstack-ha", + "url": "https://github.com/openstack/charm-interface-openstack-ha", + "vcs": null, + "branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80", + "commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80" + }, + { + "type": "layer", + "item": "interface:neutron-plugin", + "url": "https://github.com/openstack/charm-interface-neutron-plugin", + "vcs": null, + "branch": "3fba729d3e2856a9cab4de71c1252388213b9844", + "commit": "3fba729d3e2856a9cab4de71c1252388213b9844" + }, + { + "type": "layer", + "item": "interface:manila-plugin", + "url": "https://github.com/openstack/charm-interface-manila-plugin", + "vcs": null, + "branch": "14cb348a09b30c92de89878c58e790779ebdad23", + "commit": "14cb348a09b30c92de89878c58e790779ebdad23" + }, + { + "type": "layer", + "item": "interface:nrpe-external-master", + "url": "https://github.com/canonical/nrpe-external-master-interface", + "vcs": null, + "branch": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa", + "commit": "c58fe7b01a151d933681b5bf67e47ad3de65eeaa" + }, + { + "type": "python_module", + "package": "pluggy", + "vcs": null, + "version": "1.5.0" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "stable/caracal", + "version": "018b72d734223db274b59f524b7887d8153cdb6d", + "vcs": "git" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "2.1.5" + }, + { + "type": "python_module", + "package": "anyio", + "vcs": null, + "version": "3.6.2" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "6.4.2" + }, + { + "type": "python_module", + "package": "idna", + "vcs": null, + "version": "3.7" + }, + { + "type": "python_module", + "package": "sniffio", + "vcs": null, + "version": "1.3.0" + }, + { + "type": "python_module", + "package": "hatchling", + "vcs": null, + "version": "1.24.2" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.9.8" + }, + { + "type": "python_module", + "package": "packaging", + "vcs": null, + "version": "24.0" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.43.0" + }, + { + "type": "python_module", + "package": "tomli", + "vcs": null, + "version": "2.0.1" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "2.6.1" + }, + { + "type": "python_module", + "package": "trove-classifiers", + "vcs": null, + "version": "2024.4.10" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "22.0.4" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "6.0.1" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.5.2" + }, + { + "type": "python_module", + "package": "flit_scm", + "vcs": null, + "version": "1.7.0" + }, + { + "type": "python_module", + "package": "flit_core", + "vcs": null, + "version": "3.9.0" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "stable/caracal", + "version": "807f705d1d132bedb62b2eb743403e1d5867360f", + "vcs": "git" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "6.0.0" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "62.1.0" + }, + { + "type": "python_module", + "package": "Cython", + "vcs": null, + "version": "0.29.37" + }, + { + "type": "python_module", + "package": "pathspec", + "vcs": null, + "version": "0.12.1" + }, + { + "type": "python_module", + "package": "calver", + "vcs": null, + "version": "2022.6.26" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "3.1.3" + } + ] +} \ No newline at end of file diff --git a/src/test-requirements-py38.txt b/src/test-requirements-py38.txt new file mode 100644 index 0000000..795a67e --- /dev/null +++ b/src/test-requirements-py38.txt @@ -0,0 +1,657 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=src/test-requirements-py38.txt src/test-requirements.in +# +aiohttp==3.9.5 + # via + # python-libmaas + # zaza +aiosignal==1.3.1 + # via aiohttp +aodhclient==3.5.1 + # via zaza-openstack +appdirs==1.4.4 + # via python-ironicclient +argcomplete==3.3.0 + # via python-libmaas +async-generator==1.10 + # via + # zaza + # zaza-openstack +async-timeout==4.0.3 + # via aiohttp +attrs==23.2.0 + # via + # aiohttp + # cmd2 + # jsonschema + # referencing +autopage==0.5.2 + # via cliff +babel==2.14.0 + # via + # python-cinderclient + # python-heatclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient +bcrypt==4.1.2 + # via paramiko +boto3==1.34.92 + # via zaza-openstack +botocore==1.34.92 + # via + # boto3 + # s3transfer +cachetools==5.3.3 + # via google-auth +certifi==2024.2.2 + # via + # kubernetes + # requests +cffi==1.16.0 + # via + # cryptography + # pynacl +charset-normalizer==3.3.2 + # via requests +cliff==4.6.0 + # via + # aodhclient + # gnocchiclient + # osc-lib + # python-barbicanclient + # python-cloudkittyclient + # python-designateclient + # python-heatclient + # python-ironicclient + # python-neutronclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +cmd2==2.4.3 + # via cliff +colorclass==2.2.2 + # via python-libmaas +cryptography==3.3.2 + # via + # openstacksdk + # paramiko + # pyopenssl + # python-magnumclient + # trustme + # zaza + # zaza-openstack +debtcollector==3.0.0 + # via + # gnocchiclient + # oslo-config + # oslo-context + # oslo-log + # oslo-utils + # python-designateclient + # python-keystoneclient + # python-manilaclient + # python-neutronclient +decorator==5.1.1 + # via + # dogpile-cache + # jsonpath-rw + # openstacksdk + # python-magnumclient +dnspython==2.6.1 + # via + # pymongo + # zaza-openstack +dogpile-cache==1.3.2 + # via + # openstacksdk + # python-ironicclient +fasteners==0.19 + # via oslo-concurrency +frozenlist==1.4.1 + # via + # aiohttp + # aiosignal +futurist==1.10.0 + # via + # gnocchiclient + # zaza-openstack +gnocchiclient==7.0.8 + # via zaza-openstack +google-auth==2.29.0 + # via kubernetes +hvac==0.6.4 + # via + # zaza + # zaza-openstack +idna==3.7 + # via + # requests + # trustme + # yarl +importlib-metadata==7.1.0 + # via cliff +importlib-resources==6.4.0 + # via + # jsonschema + # jsonschema-specifications +iso8601==2.1.0 + # via + # gnocchiclient + # keystoneauth1 + # openstacksdk + # oslo-utils + # python-ceilometerclient + # python-heatclient + # python-neutronclient + # python-novaclient +jinja2==3.1.3 + # via + # zaza + # zaza-openstack +jmespath==1.0.1 + # via + # boto3 + # botocore + # openstacksdk +jsonpatch==1.33 + # via + # openstacksdk + # warlock +jsonpath-rw==1.4.0 + # via jsonpath-rw-ext +jsonpath-rw-ext==1.2.2 + # via python-cloudkittyclient +jsonpointer==2.4 + # via jsonpatch +jsonschema==4.21.1 + # via + # python-designateclient + # python-ironicclient + # warlock +jsonschema-specifications==2023.12.1 + # via jsonschema +juju==2.9.46.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # zaza +juju-wait==2.8.4 + # via zaza +jujubundlelib==0.5.7 + # via theblues +keystoneauth1==5.6.0 + # via + # aodhclient + # gnocchiclient + # openstacksdk + # osc-lib + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +kubernetes==29.0.0 + # via juju +lxml==5.2.1 + # via zaza-openstack +macaroonbakery==1.3.4 + # via + # juju + # python-libmaas + # theblues + # zaza +markupsafe==2.1.5 + # via jinja2 +msgpack==1.0.8 + # via oslo-serialization +multidict==6.0.5 + # via + # aiohttp + # yarl +mypy-extensions==1.0.0 + # via typing-inspect +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # oslo-config + # oslo-utils + # osprofiler + # python-neutronclient +netifaces==0.11.0 + # via + # openstacksdk + # oslo-utils + # python-octaviaclient +oauthlib==3.2.2 + # via + # kubernetes + # python-libmaas + # requests-oauthlib +openstacksdk==3.1.0 + # via + # os-client-config + # osc-lib + # python-ironicclient + # python-openstackclient +os-client-config==2.1.0 + # via + # python-cloudkittyclient + # python-magnumclient + # python-neutronclient +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +osc-lib==3.0.1 + # via + # aodhclient + # python-cloudkittyclient + # python-designateclient + # python-heatclient + # python-ironicclient + # python-magnumclient + # python-neutronclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +oslo-concurrency==6.0.0 + # via osprofiler +oslo-config==6.11.3 + # via + # oslo-concurrency + # oslo-log + # python-keystoneclient + # python-manilaclient + # zaza + # zaza-openstack +oslo-context==5.5.0 + # via oslo-log +oslo-i18n==6.3.0 + # via + # aodhclient + # osc-lib + # oslo-concurrency + # oslo-config + # oslo-log + # oslo-utils + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-glanceclient + # python-heatclient + # python-keystoneclient + # python-magnumclient + # python-neutronclient + # python-novaclient + # python-openstackclient + # python-watcherclient +oslo-log==5.5.1 + # via + # python-cloudkittyclient + # python-magnumclient + # python-manilaclient + # python-neutronclient +oslo-serialization==5.4.0 + # via + # aodhclient + # oslo-log + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-designateclient + # python-heatclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-watcherclient +oslo-utils==7.1.0 + # via + # aodhclient + # osc-lib + # oslo-concurrency + # oslo-log + # oslo-serialization + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient +osprofiler==4.1.0 + # via aodhclient +packaging==24.0 + # via oslo-utils +paramiko==2.12.0 + # via juju +pbr==6.0.0 + # via + # aodhclient + # futurist + # jsonpath-rw-ext + # keystoneauth1 + # openstacksdk + # os-service-types + # osc-lib + # oslo-concurrency + # oslo-context + # oslo-i18n + # oslo-log + # oslo-serialization + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-cloudkittyclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-watcherclient + # stevedore +pika==1.3.2 + # via zaza-openstack +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.2.1 + # via openstacksdk +ply==3.11 + # via jsonpath-rw +prettytable==0.7.2 + # via + # cliff + # futurist + # osprofiler + # python-ceilometerclient + # python-cinderclient + # python-glanceclient + # python-heatclient + # python-magnumclient + # python-manilaclient + # python-novaclient +protobuf==5.26.1 + # via macaroonbakery +pyasn1==0.6.0 + # via + # juju + # pyasn1-modules + # rsa +pyasn1-modules==0.4.0 + # via google-auth +pycparser==2.22 + # via cffi +pyinotify==0.9.6 + # via oslo-log +pymacaroons==0.13.0 + # via macaroonbakery +pymongo==4.7.0 + # via python-libmaas +pynacl==1.5.0 + # via + # macaroonbakery + # paramiko + # pymacaroons +pyopenssl==21.0.0 + # via + # python-glanceclient + # zaza-openstack +pyparsing==3.1.2 + # via + # aodhclient + # oslo-utils +pyperclip==1.8.2 + # via cmd2 +pyrfc3339==1.1 + # via + # juju + # macaroonbakery +python-barbicanclient==4.10.0 + # via zaza-openstack +python-ceilometerclient==2.9.0 + # via zaza-openstack +python-cinderclient==5.0.2 + # via + # python-openstackclient + # zaza-openstack +python-cloudkittyclient==5.0.0 + # via zaza-openstack +python-dateutil==2.9.0.post0 + # via + # botocore + # gnocchiclient + # kubernetes + # oslo-log +python-designateclient==2.12.0 + # via zaza-openstack +python-glanceclient==4.5.0 + # via + # python-openstackclient + # zaza-openstack +python-heatclient==1.18.1 + # via zaza-openstack +python-ironicclient==5.5.0 + # via zaza-openstack +python-keystoneclient==3.21.0 + # via + # python-manilaclient + # python-neutronclient + # python-openstackclient + # zaza-openstack +python-libmaas==0.6.8 + # via zaza +python-magnumclient==4.4.0 + # via zaza-openstack +python-manilaclient==1.29.0 + # via zaza-openstack +python-neutronclient==6.14.1 + # via + # python-octaviaclient + # zaza-openstack +python-novaclient==15.1.1 + # via + # python-openstackclient + # zaza-openstack +python-octaviaclient==1.10.1 + # via zaza-openstack +python-openstackclient==4.0.2 + # via python-octaviaclient +python-swiftclient==3.8.1 + # via + # python-heatclient + # zaza-openstack +python-watcherclient==4.4.0 + # via zaza-openstack +pytz==2024.1 + # via + # babel + # oslo-serialization + # oslo-utils + # pyrfc3339 + # python-libmaas +pyyaml==6.0.1 + # via + # cliff + # juju + # juju-wait + # jujubundlelib + # kubernetes + # openstacksdk + # oslo-config + # oslo-utils + # python-cloudkittyclient + # python-heatclient + # python-ironicclient + # python-libmaas + # python-watcherclient + # zaza + # zaza-openstack +referencing==0.35.0 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 + # via + # hvac + # keystoneauth1 + # kubernetes + # macaroonbakery + # oslo-config + # osprofiler + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-heatclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient + # python-manilaclient + # python-neutronclient + # python-octaviaclient + # python-swiftclient + # requests-oauthlib + # theblues +requests-oauthlib==2.0.0 + # via kubernetes +requestsexceptions==1.4.0 + # via openstacksdk +rfc3986==2.0.0 + # via oslo-config +rpds-py==0.18.0 + # via + # jsonschema + # referencing +rsa==4.9 + # via google-auth +s3transfer==0.10.1 + # via boto3 +simplejson==3.19.2 + # via + # osc-lib + # python-cinderclient + # python-manilaclient + # python-neutronclient + # python-novaclient +six==1.16.0 + # via + # cryptography + # futurist + # gnocchiclient + # jsonpath-rw + # kubernetes + # macaroonbakery + # oslo-config + # paramiko + # pymacaroons + # pyopenssl + # python-barbicanclient + # python-ceilometerclient + # python-cinderclient + # python-dateutil + # python-designateclient + # python-heatclient + # python-keystoneclient + # python-manilaclient + # python-neutronclient + # python-novaclient + # python-octaviaclient + # python-openstackclient + # python-swiftclient +stevedore==5.2.0 + # via + # cliff + # dogpile-cache + # keystoneauth1 + # osc-lib + # oslo-config + # python-ceilometerclient + # python-designateclient + # python-ironicclient + # python-keystoneclient + # python-magnumclient +tenacity==8.2.3 + # via + # zaza + # zaza-openstack +terminaltables==3.1.10 + # via python-libmaas +theblues==0.5.2 + # via juju +toposort==1.10 + # via juju +trustme==1.1.0 + # via zaza-openstack +typing-extensions==4.11.0 + # via + # dogpile-cache + # typing-inspect +typing-inspect==0.9.0 + # via juju +ujson==5.9.0 + # via gnocchiclient +urllib3==1.26.18 + # via + # botocore + # kubernetes + # requests +warlock==2.0.1 + # via python-glanceclient +wcwidth==0.2.13 + # via cmd2 +webob==1.8.7 + # via osprofiler +websocket-client==1.8.0 + # via kubernetes +websockets==7.0 + # via juju +wrapt==1.16.0 + # via + # debtcollector + # python-glanceclient +yarl==1.9.4 + # via aiohttp +zaza @ git+https://github.com/openstack-charmers/zaza.git@stable/caracal + # via + # -r src/test-requirements.in + # zaza-openstack +zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/caracal + # via -r src/test-requirements.in +zipp==3.18.1 + # via + # importlib-metadata + # importlib-resources diff --git a/src/test-requirements.txt b/src/test-requirements.in similarity index 79% rename from src/test-requirements.txt rename to src/test-requirements.in index e771023..5769b0c 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.in @@ -5,5 +5,5 @@ # # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/caracal#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/caracal#egg=zaza.openstack diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 16da884..476ac89 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -92,7 +92,7 @@ services: - '4' - '5' - '6' - channel: reef/edge + channel: squid/edge ceph-osd: charm: ch:ceph-osd @@ -105,7 +105,7 @@ services: - '7' - '8' - '9' - channel: reef/edge + channel: squid/edge ceph-fs: charm: ch:ceph-fs @@ -115,7 +115,7 @@ services: to: - '10' - '11' - channel: reef/edge + channel: squid/edge manila: charm: ../../../manila_ubuntu-22.04-amd64.charm diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index a2609b0..a933cc1 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -92,7 +92,7 @@ services: - '4' - '5' - '6' - channel: reef/edge + channel: squid/edge ceph-osd: charm: ch:ceph-osd @@ -105,7 +105,7 @@ services: - '7' - '8' - '9' - channel: reef/edge + channel: squid/edge ceph-fs: charm: ch:ceph-fs @@ -115,7 +115,7 @@ services: to: - '10' - '11' - channel: reef/edge + channel: squid/edge manila: charm: ../../../manila_ubuntu-22.04-amd64.charm diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml index 93fcc70..5ea6ca0 100644 --- a/src/tests/bundles/jammy-caracal.yaml +++ b/src/tests/bundles/jammy-caracal.yaml @@ -92,7 +92,7 @@ services: - '4' - '5' - '6' - channel: reef/edge + channel: squid/edge ceph-osd: charm: ch:ceph-osd @@ -105,7 +105,7 @@ services: - '7' - '8' - '9' - channel: reef/edge + channel: squid/edge ceph-fs: charm: ch:ceph-fs @@ -115,7 +115,7 @@ services: to: - '10' - '11' - channel: reef/edge + channel: squid/edge manila: charm: ../../../manila_ubuntu-22.04-amd64.charm diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index bff87b7..b3b4021 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -92,7 +92,7 @@ services: - '4' - '5' - '6' - channel: reef/edge + channel: squid/edge ceph-osd: charm: ch:ceph-osd @@ -105,7 +105,7 @@ services: - '7' - '8' - '9' - channel: reef/edge + channel: squid/edge ceph-fs: charm: ch:ceph-fs @@ -115,7 +115,7 @@ services: to: - '10' - '11' - channel: reef/edge + channel: squid/edge manila: charm: ../../../manila_ubuntu-22.04-amd64.charm diff --git a/src/tox.ini b/src/tox.ini index fefd94b..403c646 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -20,36 +20,36 @@ setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 allowlist_externals = juju passenv = - HOME - TERM - CS_* - OS_* - TEST_* + HOME + TERM + CS_* + OS_* + TEST_* deps = -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/test-requirements-py38.txt [testenv:pep8] -basepython = python3 +basepython = python3.8 commands = charm-proof [testenv:func-noop] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --help [testenv:func] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model [testenv:func-smoke] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model --smoke [testenv:func-target] -basepython = python3 +basepython = python3.8 commands = functest-run-suite --keep-model --bundle {posargs} diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index c5bc460..c95d90c 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,3 @@ -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/caracal#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/caracal#egg=charmhelpers diff --git a/test-requirements-py310.txt b/test-requirements-py310.txt new file mode 100644 index 0000000..cf58499 --- /dev/null +++ b/test-requirements-py310.txt @@ -0,0 +1,125 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=test-requirements-py310.txt test-requirements.in +# +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via -r test-requirements.in +extras==1.0.0 + # via + # stestr + # testtools +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.1.0 + # via -r test-requirements.in +idna==3.7 + # via requests +iso8601==2.1.0 + # via python-subunit +jinja2==3.1.3 + # via charmhelpers +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charmhelpers + # cliff + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # hvac +six==1.16.0 + # via + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +urllib3==2.2.1 + # via requests +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/test-requirements-py311.txt b/test-requirements-py311.txt new file mode 100644 index 0000000..a3a32c8 --- /dev/null +++ b/test-requirements-py311.txt @@ -0,0 +1,125 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=test-requirements-py311.txt test-requirements.in +# +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via -r test-requirements.in +extras==1.0.0 + # via + # stestr + # testtools +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.2.0 + # via -r test-requirements.in +idna==3.7 + # via requests +iso8601==2.1.0 + # via python-subunit +jinja2==3.1.3 + # via charmhelpers +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charmhelpers + # cliff + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # hvac +six==1.16.0 + # via + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +urllib3==2.2.1 + # via requests +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/test-requirements-py38.txt b/test-requirements-py38.txt new file mode 100644 index 0000000..3974193 --- /dev/null +++ b/test-requirements-py38.txt @@ -0,0 +1,125 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile --constraint=/home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt --output-file=test-requirements-py38.txt test-requirements.in +# +certifi==2024.2.2 + # via requests +cffi==1.16.0 + # via cryptography +charmhelpers==1.2.1 + # via charms-reactive +charms-openstack @ git+https://github.com/openstack/charms.openstack.git@stable/caracal + # via -r test-requirements.in +charms-reactive==1.5.2 + # via -r test-requirements.in +charset-normalizer==3.3.2 + # via requests +cliff==2.18.0 + # via + # -r test-requirements.in + # stestr +cmd2==0.8.9 + # via cliff +coverage==7.5.0 + # via -r test-requirements.in +cryptography==3.3.2 + # via -r test-requirements.in +extras==1.0.0 + # via + # stestr + # testtools +fixtures==3.0.0 + # via + # stestr + # testtools +hvac==2.1.0 + # via -r test-requirements.in +idna==3.7 + # via requests +iso8601==2.1.0 + # via python-subunit +jinja2==3.1.3 + # via charmhelpers +lxml==5.2.1 + # via -r test-requirements.in +markupsafe==2.1.5 + # via jinja2 +mock==5.1.0 + # via -r test-requirements.in +netaddr==0.10.1 + # via + # -c /home/alex/Projects/Canonical/git/github.com/openstack-charmers/release-tools/global/constraints-2024.1.txt + # charmhelpers +netifaces==0.11.0 + # via -r test-requirements.in +nose==1.3.7 + # via -r test-requirements.in +pbr==5.6.0 + # via + # -r test-requirements.in + # charmhelpers + # cliff + # fixtures + # stestr + # stevedore + # testtools +prettytable==0.7.2 + # via cliff +psutil==5.9.8 + # via -r test-requirements.in +psycopg2-binary==2.9.9 + # via -r test-requirements.in +pyaml==24.4.0 + # via charms-reactive +pycparser==2.22 + # via cffi +pyparsing==2.4.7 + # via + # -r test-requirements.in + # cliff + # cmd2 +pyperclip==1.8.2 + # via cmd2 +python-subunit==1.4.4 + # via stestr +pyyaml==6.0.1 + # via + # charmhelpers + # cliff + # pyaml + # stestr +requests==2.31.0 + # via + # -r test-requirements.in + # hvac +six==1.16.0 + # via + # cliff + # cmd2 + # cryptography + # fixtures +stestr==4.1.0 + # via -r test-requirements.in +stevedore==5.2.0 + # via cliff +tenacity==8.2.3 + # via -r test-requirements.in +testtools==2.5.0 + # via + # -r test-requirements.in + # fixtures + # python-subunit + # stestr +tomlkit==0.12.4 + # via stestr +urllib3==2.2.1 + # via requests +voluptuous==0.14.2 + # via stestr +wcwidth==0.2.13 + # via cmd2 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/test-requirements.txt b/test-requirements.in similarity index 93% rename from test-requirements.txt rename to test-requirements.in index bdb178e..5e994ad 100644 --- a/test-requirements.txt +++ b/test-requirements.in @@ -20,7 +20,7 @@ mock>=1.2 nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/caracal#egg=charms.openstack # # Revisit for removal / mock improvement: # diff --git a/tox.ini b/tox.ini index 30c5840..2c9cb26 100644 --- a/tox.ini +++ b/tox.ini @@ -34,47 +34,51 @@ allowlist_externals = bash tox deps = - -r{toxinidir}/requirements.txt + -r{toxinidir}/merged-requirements-py38.txt [testenv:build] basepython = python3 +deps = # charmcraft clean is done to ensure that # `tox -e build` always performs a clean, repeatable build. # For faster rebuilds during development, -# directly run `charmcraft -v pack && ./rename.sh`. +# directly run `charmcraft -v pack commands = charmcraft clean charmcraft -v pack charmcraft clean -[testenv:build-reactive] -basepython = python3 -commands = - charm-build --log-level DEBUG --use-lock-file-branches --binary-wheels-from-source -o {toxinidir}/build/builds src {posargs} - -[testenv:add-build-lock-file] -basepython = python3 -commands = - charm-build --log-level DEBUG --write-lock-file -o {toxinidir}/build/builds src {posargs} - [testenv:py3] basepython = python3 deps = -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/test-requirements-py310.txt +commands = stestr run --slowest {posargs} + +[testenv:py38] +basepython = python3.8 +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements-py38.txt commands = stestr run --slowest {posargs} [testenv:py310] basepython = python3.10 deps = -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/test-requirements-py310.txt +commands = stestr run --slowest {posargs} + +[testenv:py311] +basepython = python3.11 +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements-py311.txt commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests [testenv:cover] @@ -83,8 +87,7 @@ commands = flake8 {posargs} src unit_tests basepython = python3 deps = -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/merged-requirements-py310.txt setenv = {[testenv]setenv} PYTHON=coverage run