From f5dc7145dcbd3cb7fab0c99a3fbd676b5954f3d9 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 25 Mar 2025 10:19:55 +0100 Subject: [PATCH] Better support running multicloud in a venv - explicitly pin python 3.8 in tox.ini - downgrade pyYAML since there are issues with cython [0] - allow running find from inside venv [0] https://github.com/yaml/pyyaml/issues/724 Issue-ID: MULTICLOUD-1510 Change-Id: I43fcaa7306a59028739fe47d15ab72b761688a99 Signed-off-by: Fiete Ostkamp --- .gitignore | 2 ++ multivimbroker/requirements.txt | 3 +-- multivimbroker/tox.ini | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f53107e..7d4856a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ multivimbroker/test-reports/ # Docs related docs/html *.log +.venv +venv diff --git a/multivimbroker/requirements.txt b/multivimbroker/requirements.txt index cadc98f..3bf356e 100644 --- a/multivimbroker/requirements.txt +++ b/multivimbroker/requirements.txt @@ -26,7 +26,7 @@ httplib2==0.19.1 # mock==2.0.0 # unittest_xml_reporting==1.12.0 -PyYAML==5.4.1 +PyYAML==5.3.1 # for pecan framework # pecan>=1.2.1 @@ -37,4 +37,3 @@ PyYAML==5.4.1 # uwsgi for parallel processing # uwsgi - diff --git a/multivimbroker/tox.ini b/multivimbroker/tox.ini index 7ba8967..f2563bc 100644 --- a/multivimbroker/tox.ini +++ b/multivimbroker/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36,pep8,cover +envlist = py38,pep8,cover skipsdist = true [tox:jenkins] @@ -7,13 +7,14 @@ downloadcache = ~/cache/pip [testenv] basepython = - py36: python3 + py38: python3.8 pep8: python3 cover: python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +allowlist_externals = /usr/bin/find commands = /usr/bin/find . -type f -name "*.py[c|o]" -delete python manage.py test multivimbroker -- 2.16.6