diff options
| -rw-r--r-- | .zuul.yaml | 2 | ||||
| -rw-r--r-- | bandit.yaml | 3 | ||||
| -rw-r--r-- | bindep.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 913bf434e..c5c23c29d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -500,6 +500,8 @@ - job: name: swift-tox-lower-constraints parent: openstack-tox-lower-constraints + # This seems defensible for a l-c job + nodeset: ubuntu-jammy vars: bindep_profile: test py27 python_version: 2.7 diff --git a/bandit.yaml b/bandit.yaml index ed1c2b61e..7e9f58542 100644 --- a/bandit.yaml +++ b/bandit.yaml @@ -27,7 +27,6 @@ # B306 : mktemp_q # B307 : eval # B308 : mark_safe -# B309 : httpsconnection # B310 : urllib_urlopen # B311 : random # B312 : telnetlib @@ -80,7 +79,7 @@ # B703 : django_mark_safe # (optional) list included test IDs here, eg '[B101, B406]': -tests: [B102, B103, B302, B303, B304, B305, B306, B308, B309, B310, B401, B501, B502, B506, B601, B602, B609] +tests: [B102, B103, B302, B303, B304, B305, B306, B308, B310, B401, B501, B502, B506, B601, B602, B609] # (optional) list skipped test IDs here, eg '[B101, B406]': skips: diff --git a/bindep.txt b/bindep.txt index 59ab57d23..fd57584c8 100644 --- a/bindep.txt +++ b/bindep.txt @@ -17,7 +17,7 @@ libxslt-devel [platform:rpm] libxslt1-dev [platform:dpkg] libxslt-dev [platform:apk] memcached -python-dev [platform:dpkg platform:apk] +python-dev [platform:dpkg platform:apk !platform:ubuntu-jammy] python-devel [platform:rpm !py36] python3-dev [platform:dpkg platform:apk test] python3-devel [platform:rpm !py27 test] @@ -2,6 +2,11 @@ envlist = py37,py27,pep8 minversion = 2.3.2 skipsdist = True +requires = + # required to support py27/py36 envs + virtualenv<20.22 + # project-wide requirement; see .zuul.yaml + tox<4 [testenv] usedevelop = True |