From d259ea394b6cd7cc7e142ea15ebac10b4b05756c Mon Sep 17 00:00:00 2001 From: elajkat Date: 2022年12月19日 12:57:19 +0100 Subject: [PATCH] Tox4: add allowlist_externals where necessary With tox4 allowlist_externals is more strictly checked, so fix it where necessary and fix pylint version. Depends-On: https://review.opendev.org/c/zuul/zuul-jobs/+/866943 Related-Bug: #1999558 Change-Id: I7a4fed13cf6d04609f2e2e074a4c6fc8d17107d4 --- doc/requirements.txt | 2 ++ test-requirements.txt | 3 +-- tox.ini | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 60372d03..5879dd83 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,6 +4,8 @@ sphinx>=2.0.0,!=2.1.0 # BSD openstackdocstheme>=2.2.1 # Apache-2.0 reno>=3.1.0 # Apache-2.0 +oslo.config>=5.2.0 # Apache-2.0 +oslo.policy>=3.12.0 # Apache-2.0 sphinxcontrib-blockdiag>=1.5.4 # BSD sphinxcontrib-seqdiag>=0.8.4 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 71e77c03..6dca4192 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,8 +10,7 @@ psycopg2>=2.8.5 # LGPL/ZPL PyMySQL>=0.7.6 # MIT License WebOb>=1.8.2 # MIT oslotest>=3.2.0 # Apache-2.0 -astroid==2.1.0 # LGPLv2.1 -pylint==2.2.0 # GPLv2 +pylint==2.5.3 # GPLv2 pytest>=5.3.5 # MIT stestr>=1.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 2eb0b48d..59b1ff4c 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,8 @@ skipsdist = True ignore_basepython_conflict = True [testenv] -usedevelop = True +usedevelop = False +skipsdist = False basepython = python3 setenv = OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true} @@ -17,7 +18,7 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/up -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} - python {toxinidir}/tools/django-manage.py test bgpvpn_dashboard + python {toxinidir}/tools/django-manage.py test {envsitepackagesdir}/bgpvpn_dashboard [testenv:releasenotes] deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -36,6 +37,8 @@ commands = neutron-db-manage --subproject networking-bgpvpn --database-connection sqlite:// check_migration {[testenv:genconfig]commands} {[testenv:genpolicy]commands} +allowlist_externals = + {toxinidir}/tools/generate_config_file_samples.sh [testenv:dsvm] setenv = OS_FAIL_ON_MISSING_DEPS=1 @@ -89,6 +92,8 @@ commands = oslo_debug_helper -t networking_bgpvpn/tests/unit {posargs} [testenv:genconfig] commands = {toxinidir}/tools/generate_config_file_samples.sh +allowlist_externals = + {toxinidir}/tools/generate_config_file_samples.sh [testenv:genpolicy] commands = oslopolicy-sample-generator --config-file=etc/oslo-policy-generator/policy.conf

AltStyle によって変換されたページ (->オリジナル) /