Updates to pin charm-tools to 2.8.3

* Update requirements.txt to pin charm-tools to 2.8.3
* Update tox.ini to change the build parameters.
* This upgrades from <2.7 which adds reproducible charms
* Bug was fixed that controlled the default output directory
  doesn't get 'builds' appended.  The tox change puts it
  back so that stable & master both build to the same
  directory.  This may be reviewed in the future.

Change-Id: Ie84d7489c03c40392fb5d8eb7e13bae09c9ff9d7
This commit is contained in:
Alex Kavanagh 2021-02-17 12:06:05 +00:00
parent 3bdafbaf95
commit fa478aee7e
2 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
# Build requirements
charm-tools>=2.4.4,<2.8
charm-tools==2.8.3
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
# published

View File

@ -28,7 +28,7 @@ deps =
[testenv:build]
basepython = python3
commands =
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
[testenv:py3]
basepython = python3