openstack
/
charm-manila-generic
Code Issues Proposed changes

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: I809f8b581a7e86d43acb8115c3d0e609285d9bd8
This commit is contained in:
Alex Kavanagh 2021-05-03 15:33:46 +01:00
parent a177fa4616
commit a8c7b46928
4 changed files with 5 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/build.lock
View File

@ -1,164 +0,0 @@
{
"locks": [
{
"type": "layer",
"item": "layer:options",
"url": "https://github.com/juju-solutions/layer-options.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
},
{
"type": "layer",
"item": "layer:basic",
"url": "https://github.com/juju-solutions/layer-basic.git",
"vcs": null,
"branch": "refs/heads/master",
"commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
},
{
"type": "layer",
"item": "layer:openstack",
"url": "https://github.com/openstack/charm-layer-openstack",
"vcs": null,
"branch": "refs/heads/master",
"commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
},
{
"type": "layer",
"item": "manila-generic",
"url": null,
"vcs": null,
"branch": "refs/heads/master",
"commit": "ef01b80181f5742840351f1bfc1b72dbf70fc4ee"
},
{
"type": "layer",
"item": "interface:tls-certificates",
"url": "https://github.com/juju-solutions/interface-tls-certificates",
"vcs": null,
"branch": "refs/heads/master",
"commit": "d9850016d930a6d507b9fd45e2598d327922b140"
},
{
"type": "layer",
"item": "interface:manila-plugin",
"url": "https://github.com/openstack/charm-interface-manila-plugin",
"vcs": null,
"branch": "refs/heads/master",
"commit": "14cb348a09b30c92de89878c58e790779ebdad23"
},
{
"type": "python_module",
"package": "charms.openstack",
"url": "git+https://opendev.org/openstack/charms.openstack.git",
"branch": "refs/heads/stable/21.04",
"version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
"vcs": "git"
},
{
"type": "python_module",
"package": "netaddr",
"vcs": null,
"version": "0.7.19"
},
{
"type": "python_module",
"package": "pbr",
"vcs": null,
"version": "5.5.1"
},
{
"type": "python_module",
"package": "setuptools",
"vcs": null,
"version": "41.6.0"
},
{
"type": "python_module",
"package": "Jinja2",
"vcs": null,
"version": "2.10.1"
},
{
"type": "python_module",
"package": "pip",
"vcs": null,
"version": "18.1"
},
{
"type": "python_module",
"package": "pyaml",
"vcs": null,
"version": "20.4.0"
},
{
"type": "python_module",
"package": "dnspython",
"vcs": null,
"version": "1.16.0"
},
{
"type": "python_module",
"package": "MarkupSafe",
"vcs": null,
"version": "1.1.1"
},
{
"type": "python_module",
"package": "charmhelpers",
"url": "git+https://github.com/juju/charm-helpers.git",
"branch": "refs/heads/stable/21.04",
"version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
"vcs": "git"
},
{
"type": "python_module",
"package": "wheel",
"vcs": null,
"version": "0.33.6"
},
{
"type": "python_module",
"package": "charms.reactive",
"vcs": null,
"version": "1.4.1"
},
{
"type": "python_module",
"package": "Tempita",
"vcs": null,
"version": "0.5.2"
},
{
"type": "python_module",
"package": "PyYAML",
"vcs": null,
"version": "5.2"
},
{
"type": "python_module",
"package": "setuptools_scm",
"vcs": null,
"version": "1.17.0"
},
{
"type": "python_module",
"package": "psutil",
"vcs": null,
"version": "5.8.0"
},
{
"type": "python_module",
"package": "netifaces",
"vcs": null,
"version": "0.10.9"
},
{
"type": "python_module",
"package": "six",
"vcs": null,
"version": "1.15.0"
}
]
}

4
src/test-requirements.txt
View File

@ -11,5 +11,5 @@ charm-tools>=2.4.4
keyring<21 keyring<21
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) # 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.git#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-openstack-tests.git#egg=zaza.openstack

4
src/wheelhouse.txt
View File

@ -1,4 +1,4 @@
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

2
test-requirements.txt
View File

@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
nose>=1.3.7 nose>=1.3.7
coverage>=3.6 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: # Revisit for removal / mock improvement:
netifaces # vault netifaces # vault