projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into paas
[osm/devops.git]
/
installers
/
charm
/
pla
/
tox.ini
diff --git
a/installers/charm/pla/tox.ini
b/installers/charm/pla/tox.ini
index
30e0ea8
..
f3c9144
100644
(file)
--- a/
installers/charm/pla/tox.ini
+++ b/
installers/charm/pla/tox.ini
@@
-29,8
+29,10
@@
toxworkdir = /tmp/.tox
[testenv]
basepython = python3.8
[testenv]
basepython = python3.8
-setenv = VIRTUAL_ENV={envdir}
- PYTHONDONTWRITEBYTECODE = 1
+setenv =
+ VIRTUAL_ENV={envdir}
+ PYTHONPATH = {toxinidir}:{toxinidir}/lib:{toxinidir}/src
+ PYTHONDONTWRITEBYTECODE = 1
deps = -r{toxinidir}/requirements.txt
deps = -r{toxinidir}/requirements.txt
@@
-69,7
+71,7
@@
commands =
[testenv:pylint]
deps = {[testenv]deps}
-r{toxinidir}/requirements-test.txt
[testenv:pylint]
deps = {[testenv]deps}
-r{toxinidir}/requirements-test.txt
- pylint
+ pylint
==2.10.2
commands =
pylint -E src/ tests/
commands =
pylint -E src/ tests/
@@
-95,19
+97,22
@@
commands = yamllint .
#######################################################################################
[testenv:build]
passenv=HTTP_PROXY HTTPS_PROXY NO_PROXY
#######################################################################################
[testenv:build]
passenv=HTTP_PROXY HTTPS_PROXY NO_PROXY
-deps = charmcraft
whitelist_externals =
charmcraft
whitelist_externals =
charmcraft
- cp
+ sh
commands =
commands =
- charmcraft build
- cp -r build release
+ charmcraft pack
+ sh -c 'ubuntu_version=20.04; \
+ architectures="amd64-aarch64-arm64"; \
+ charm_name=`cat metadata.yaml | grep -E "^name: " | cut -f 2 -d " "`; \
+ mv $charm_name"_ubuntu-"$ubuntu_version-$architectures.charm $charm_name.charm'
#######################################################################################
[flake8]
ignore =
W291,
W293,
#######################################################################################
[flake8]
ignore =
W291,
W293,
+ W503,
E123,
E125,
E226,
E123,
E125,
E226,