diff --git a/charmcraft.yaml b/charmcraft.yaml index 515b5e3..9fe8fce 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -4,6 +4,9 @@ parts: charm: source: src/ plugin: reactive + reactive-charm-build-arguments: + - --use-lock-file-branches + - --verbose build-snaps: - charm/3.x/stable build-environment: diff --git a/osci.yaml b/osci.yaml index af1c5a6..299567e 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: nova-cell-controller build_type: charmcraft - charmcraft_channel: 2.0/stable + charmcraft_channel: 2.1/stable diff --git a/rebuild b/rebuild index 596d783..d3d950d 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -53e34944-1178-11ec-9edc-c38acc23d967 +7122132a-3dd4-11ee-b1fd-e3b5125dc9a2 diff --git a/tox.ini b/tox.ini index 675ab0c..5e29bfb 100644 --- a/tox.ini +++ b/tox.ini @@ -75,6 +75,7 @@ commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 + PyYAML==6.0.1 git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests