From 64637996e845a294fea049538f58ef97f20b2f67 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 3 May 2021 15:33:46 +0100 Subject: [PATCH] Updates to flip all libraries back to master This patchset updates all the requirements for charms.openstack, charm-helpers, charms.ceph, zaza and zaza-openstack-tests back to master branch. Change-Id: I244c1a9ce02c0c06edd2253389895a494f2622dd --- src/build.lock | 224 -------------------------------------- src/test-requirements.txt | 4 +- src/wheelhouse.txt | 4 +- test-requirements.txt | 2 +- 4 files changed, 5 insertions(+), 229 deletions(-) delete mode 100644 src/build.lock diff --git a/src/build.lock b/src/build.lock deleted file mode 100644 index 59ffaea..0000000 --- a/src/build.lock +++ /dev/null @@ -1,224 +0,0 @@ -{ - "locks": [ - { - "item": "layer:options", - "vcs": null, - "url": "https://github.com/juju-solutions/layer-options.git", - "branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56", - "type": "layer", - "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" - }, - { - "item": "layer:basic", - "vcs": null, - "url": "https://github.com/juju-solutions/layer-basic.git", - "branch": "623e69c7b432456fd4364f6e1835424fd6b5425e", - "type": "layer", - "commit": "623e69c7b432456fd4364f6e1835424fd6b5425e" - }, - { - "item": "layer:openstack", - "vcs": null, - "url": "https://github.com/openstack/charm-layer-openstack", - "branch": "ba152d41b4a1109073d335415f43c4248109e7c7", - "type": "layer", - "commit": "ba152d41b4a1109073d335415f43c4248109e7c7" - }, - { - "item": "layer:leadership", - "vcs": null, - "url": "https://git.launchpad.net/layer-leadership", - "branch": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f", - "type": "layer", - "commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f" - }, - { - "item": "keystone-saml-mellon", - "vcs": null, - "url": null, - "branch": "c07fcf57326b43de04d8ef2d2697e0de44baa319", - "type": "layer", - "commit": "c07fcf57326b43de04d8ef2d2697e0de44baa319" - }, - { - "item": "interface:tls-certificates", - "vcs": null, - "url": "https://github.com/juju-solutions/interface-tls-certificates", - "branch": "d9850016d930a6d507b9fd45e2598d327922b140", - "type": "layer", - "commit": "d9850016d930a6d507b9fd45e2598d327922b140" - }, - { - "item": "interface:keystone-fid-service-provider", - "vcs": null, - "url": "https://github.com/openstack/charm-interface-keystone-fid-service-provider", - "branch": "be0926efafaa9ffe1df84f2fbd6b8a5d3d58b270", - "type": "layer", - "commit": "be0926efafaa9ffe1df84f2fbd6b8a5d3d58b270" - }, - { - "item": "interface:websso-fid-service-provider", - "vcs": null, - "url": "https://github.com/openstack/charm-interface-websso-fid-service-provider", - "branch": "b7c066abf22edec30af17c3da4612cd398b1306a", - "type": "layer", - "commit": "b7c066abf22edec30af17c3da4612cd398b1306a" - }, - { - "item": "interface:juju-info", - "vcs": null, - "url": "https://github.com/juju-solutions/interface-juju-info.git", - "branch": "4e2f90052b3c02031d09f10900c9e9cb22565dee", - "type": "layer", - "commit": "4e2f90052b3c02031d09f10900c9e9cb22565dee" - }, - { - "vcs": null, - "type": "python_module", - "package": "charms.reactive", - "version": "1.4.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "cffi", - "version": "1.14.5" - }, - { - "vcs": null, - "type": "python_module", - "package": "netifaces", - "version": "0.10.9" - }, - { - "vcs": null, - "type": "python_module", - "package": "PyYAML", - "version": "5.2" - }, - { - "vcs": null, - "type": "python_module", - "package": "psutil", - "version": "5.8.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "pyaml", - "version": "20.4.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "netaddr", - "version": "0.7.19" - }, - { - "vcs": null, - "type": "python_module", - "package": "setuptools", - "version": "41.6.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "wheel", - "version": "0.33.6" - }, - { - "vcs": null, - "type": "python_module", - "package": "asn1crypto", - "version": "1.4.0" - }, - { - "vcs": "git", - "url": "git+https://opendev.org/openstack/charms.openstack.git", - "package": "charms.openstack", - "branch": "stable/21.04", - "version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1", - "type": "python_module" - }, - { - "vcs": null, - "type": "python_module", - "package": "six", - "version": "1.15.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "MarkupSafe", - "version": "1.1.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "Tempita", - "version": "0.5.2" - }, - { - "vcs": null, - "type": "python_module", - "package": "pbr", - "version": "5.5.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "dnspython", - "version": "1.16.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "cryptography", - "version": "2.3.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "setuptools_scm", - "version": "1.17.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "lxml", - "version": "4.5.0" - }, - { - "vcs": null, - "type": "python_module", - "package": "pycparser", - "version": "2.20" - }, - { - "vcs": null, - "type": "python_module", - "package": "pip", - "version": "18.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "idna", - "version": "3.1" - }, - { - "vcs": null, - "type": "python_module", - "package": "Jinja2", - "version": "2.10.1" - }, - { - "vcs": "git", - "url": "git+https://github.com/juju/charm-helpers.git", - "package": "charmhelpers", - "branch": "stable/21.04", - "version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6", - "type": "python_module" - } - ] -} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index eb4844b..520681e 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -11,5 +11,5 @@ charm-tools>=2.4.4 keyring<21 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) -git+https://github.com/openstack-charmers/zaza.git@stable/21.04#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 9744f42..947dc7f 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -2,6 +2,6 @@ cryptography lxml psutil -git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 16bbc27..3f08524 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6' nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault