From 3b8a9126db7f327594bd526a38f40bf85ce68248 Mon Sep 17 00:00:00 2001 From: Anand Bhat Date: Sat, 8 May 2021 18:01:19 +0530 Subject: [PATCH] Changed minversion in tox to 3.18.0 The patch bumps min version of tox to 3.18.0 python in order to replace tox's whitelist_externals by allowlist_externals option: https://github.com/tox-dev/tox/blob/master/docs/changelog.rst#v3180-2020-07-23 The patch also sets ubuntu-focal nodeset for the docs job as newer ubuntu (with newer tox available) is required. Change-Id: I5b32e7f65710199601a6856dba86584390eb92b7 --- .zuul.yaml | 15 +++++++++++++-- tox.ini | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c9bbba6..4a98760 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,15 @@ - project: templates: - - nodejs4-jobs - - nodejs10-docs + - nodejs14-jobs + check: + jobs: + - nodejs-run-docs: + vars: + node_version: 14 + nodeset: ubuntu-focal + gate: + jobs: + - nodejs-run-docs: + vars: + node_version: 14 + nodeset: ubuntu-focal diff --git a/tox.ini b/tox.ini index 2764a2c..edb48a2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -minversion = 2.4.0 +minversion = 3.18.0 skipsdist = True ignore_basepython_conflict = True @@ -20,11 +20,11 @@ deps = commands = rm -rf doc/build sphinx-build -W -b html doc/source doc/build/html -whitelist_externals = rm +allowlist_externals = rm [testenv:pdf-docs] deps = {[testenv:docs]deps} -whitelist_externals = +allowlist_externals = make commands = sphinx-build -W -b latex doc/source doc/build/pdf