From a110206709aac57ac3d10a77cfd361078ce35ed4 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 11 Sep 2019 13:22:06 +0000 Subject: [PATCH] Revert "check-plugins job: switch to python3" This reverts commit 44f9cc01cdd2ea6c847a65b40bfd2b00953a48f2. Change-Id: Ie9692634ae0bcc814fa345a8054a2e6e7685b6b3 --- tests/check_osc_commands.py | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/check_osc_commands.py b/tests/check_osc_commands.py index 5bd1f04..2e37dd6 100755 --- a/tests/check_osc_commands.py +++ b/tests/check_osc_commands.py @@ -131,7 +131,7 @@ def _check_command_overlap(valid_cmds): namespace. """ overlap_cmds = {} - for ep_name, ep_mods in valid_cmds.items(): + for ep_name, ep_mods in valid_cmds.iteritems(): # Skip openstack.cli.base client entry points for ep_mod in ep_mods: for ep_name_search in valid_cmds.keys(): diff --git a/tox.ini b/tox.ini index 74da305..73b018e 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html [testenv:osc_plugins] -basepython = python3 +basepython = python2.7 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt