From 36f0b89766f08790579f809eef848657a81ebc41 Mon Sep 17 00:00:00 2001 From: Kazuhiro Suzuki Date: Sat, 11 Apr 2020 03:15:57 +0900 Subject: [PATCH] Blacklist stestr 3.0.0 and drop pypy stestr 3.0.0 does not support python 2.7 but has been released without the proper metadata to reflect that. As a result, there is a python2 wheel stestr-3.0.0-py2-none-any.whl which get picked up. Blacklist stestr 3.0.0 to fix '--list': no such option error Drop pypy testing since pypy jobs are always failling. Signed-off-by: Antoine Musso Signed-off-by: Andreas Jaeger Change-Id: Ia2f7c814f21c78f29ec9024997469625f92bc401 --- .zuul.yaml | 2 -- test-requirements.txt | 2 +- tox.ini | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 203f99c..d5c240d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,8 +18,6 @@ jobs: - openstack-tox-linters - openstack-tox-py27 - - openstack-tox-pypy: - nodeset: ubuntu-bionic - jjb-tox-cross-jenkins-job-builder gate: jobs: diff --git a/test-requirements.txt b/test-requirements.txt index 59476de..c32157f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ requests-mock>=1.4.0 requests-kerberos sphinx>=1.6.0,<2.0.0;python_version=='2.7' # BSD sphinx>=1.6.0;python_version>='3.4' # BSD -stestr>=2.0.0 +stestr>=2.0.0,!=3.0.0 testscenarios testtools pre-commit diff --git a/tox.ini b/tox.ini index a42fa57..8b9c701 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 2.0 skipsdist = True -envlist = py{34,27,35,36}, linters, pypy +envlist = py{34,27,35,36}, linters [testenv] setenv =