Stop setting version specific basepython binaries

Tox should be smart enough to figure out the correct python version on
its own, avoid having to follow-up for every new python release.

Change-Id: If515467fd4c9e678d54d4e8551b52611fec786ff
This commit is contained in:
Dr. Jens Harbott 2020-02-07 13:36:08 +00:00 committed by Erik Olof Gunnar Andersson
parent 19ec7d9cd1
commit 65736672da
4 changed files with 11 additions and 21 deletions

View File

@ -29,7 +29,7 @@ dogpile.cache==0.6.5
dulwich==0.19.0
edgegrid-python==1.1.1
enum-compat==0.0.2
eventlet==0.18.2
eventlet==0.25.1
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
@ -60,8 +60,8 @@ logutils==0.3.5
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monasca-statsd==1.1.0
mock==3.0.0
monasca-statsd==1.4.0
monotonic==1.4
mox3==0.25.0
msgpack==0.5.6
@ -83,7 +83,7 @@ oslo.context==2.19.2
oslo.db==4.27.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==5.29.0
oslo.messaging==9.5.0
oslo.middleware==3.31.0
oslo.policy==1.30.0
oslo.reports==1.18.0

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
Babel!=2.4.0,>=2.3.4 # BSD
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
eventlet>=0.25.1 # MIT
Flask!=0.11,>=0.10 # BSD
greenlet>=0.4.10 # MIT
Jinja2>=2.10 # BSD License (3 clause)
@ -13,7 +13,7 @@ keystonemiddleware>=4.17.0 # Apache-2.0
netaddr>=0.7.18 # BSD
oslo.config>=5.2.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.messaging>=5.29.0 # Apache-2.0
oslo.messaging>=9.5.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0
@ -47,6 +47,6 @@ python-memcached>=1.56 # PSF
tooz>=1.58.0 # Apache-2.0
debtcollector>=1.2.0 # Apache-2.0
os-win>=3.0.0 # Apache-2.0
monasca-statsd>=1.1.0 # Apache-2.0
monasca-statsd>=1.4.0 # Apache-2.0
futurist>=1.2.0 # Apache-2.0
edgegrid-python>=1.1.1 # Apache-2.0

View File

@ -6,7 +6,7 @@
hacking>=3.0,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
mock>=3.0.0 # BSD
stestr>=2.0.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0

16
tox.ini
View File

@ -1,6 +1,7 @@
[tox]
minversion = 2.3.2
minversion = 3.1.0
envlist = py37,flake8
ignore_basepython_conflict = True
skipsdist = True
[testenv]
@ -29,6 +30,7 @@ install_command =
commands =
find . -type f -name "*.py[c|o]" -delete
rm -f .testrepository/times.dbm
stestr run {posargs}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=master}
-r{toxinidir}/requirements.txt
@ -38,18 +40,6 @@ whitelist_externals =
find
rm
[testenv:py36]
basepython = python3.6
commands =
{[testenv]commands}
stestr run {posargs}
[testenv:py37]
basepython = python3.7
commands =
{[testenv]commands}
stestr run '{posargs}'
[testenv:docs]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}