openstack/charm-barbican-softhsm
Code Issues Proposed changes

21.04 libraries freeze for charms on master branch

Browse Source 
* charm-helpers sync for classic charms
* build.lock file for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure stable/21.04 branch for charms.openstack
  - ensure stable/21.04 branch for charm-helpers

Change-Id: I8b159e2fd0eadecb23c580804ec9b3609b14fdb1
This commit is contained in:
Alex Kavanagh 2021-04-03 20:18:01 +01:00
parent c6dcfbbdf4
commit c478be4764
4 changed files with 173 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/build.lock Normal file
View File

@ -0,0 +1,164 @@
{
"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": "barbican-softhsm",
"url": null,
"vcs": null,
"branch": "refs/heads/master",
"commit": "c6dcfbbdf414176f55668460ddc1af83b4ab5a6b"
},
{
"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:barbican-hsm",
"url": "https://opendev.org/x/charm-interface-barbican-hsm",
"vcs": null,
"branch": "refs/heads/master",
"commit": "a2705db6a534bdc61bfac2b69f539ead165da4b9"
},
{
"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/wheelhouse.txt
View File

@ -1,5 +1,5 @@
psutil
git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers

2
test-requirements.txt
View File

@ -10,4 +10,4 @@ charms.reactive
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/21.04#egg=charms.openstack

7
tox.ini
View File

@ -28,7 +28,12 @@ deps =
[testenv:build]
basepython = python3
commands =
charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
charm-build --log-level DEBUG --use-lock-file-branches -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