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: I38c701d7688ba44cd755901379bee36e849081fd
This commit is contained in:
parent
19aa620069
commit
4a64655620
@ -9,7 +9,7 @@
|
|||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||||
|
|
||||||
# Build requirements
|
# 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
|
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
|
||||||
# published
|
# published
|
||||||
|
2
tox.ini
2
tox.ini
@ -28,7 +28,7 @@ deps =
|
|||||||
[testenv:build]
|
[testenv:build]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
commands =
|
commands =
|
||||||
charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
|
charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
|
||||||
|
|
||||||
[testenv:py3]
|
[testenv:py3]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
Loading…
Reference in New Issue
Block a user