aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-11-30 17:03:56 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2023-12-07 18:59:49 +0100
commitcf969a14f29eb65553b26352d5bcdb1cecfd3d25 (patch)
treece7ae9d74071279e48d5ed8919d39cb62c63bcec
parent476c6a9c1730bb1e3f40a1b16bd37a57b4e9948c (diff)
Remove PyYaml from upper constraints
It doesnt compile because of cython Change-Id: I6e1c531a2f7b3384bc4a5256120d917dec7c43c6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0f6720448bd99fd9b732f124da1a1272ee331589)
-rw-r--r--docker/core/Dockerfile1
-rw-r--r--tox.ini12
2 files changed, 5 insertions, 8 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index eb82847a..c57281b6 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -15,6 +15,7 @@ RUN apk -U upgrade && \
(cd /src/requirements && \
git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
git checkout FETCH_HEAD) && \
+ sed -i -E /^PyYAML==+.*$/d /src/requirements/upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) \
sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \
apk add --no-cache py3-pynacl ;; esac && \
diff --git a/tox.ini b/tox.ini
index 313ef2b6..cc1472fe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,9 +29,7 @@ commands = pylint \
[testenv:yamllint]
basepython = python3.10
-files =
- .travis.yml
- docker
+files =.travis.yml docker
commands =
yamllint {[testenv:yamllint]files}
@@ -41,15 +39,13 @@ commands = bandit -r functest_kubernetes -x tests -n 5 -ll
[testenv:bashate]
basepython = python3.10
-files =
- build.sh
- functest_kubernetes/ci/download_images.sh
+files =build.sh functest_kubernetes/ci/download_images.sh
commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
[testenv:perm]
basepython = python3.10
-whitelist_externals = bash
-path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*'
+allowlist_externals = bash
+path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*' -not -path './elements/functest-kubernetes/install.d/*'
commands =
bash -c "\
find {[testenv:perm]path} \( -type f -not -perm 644 -o -type d -not -perm 755 \) \