diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 841faad4..ecf1db7c 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -5,13 +5,11 @@ - openstack-python36-jobs check: jobs: - - openstack-tox-py27 - openstack-tox-linters - election-tox-ci-checks-review - election-tox-ci-checks-election gate: jobs: - - openstack-tox-py27 - openstack-tox-linters - election-tox-ci-checks-election post: diff --git a/openstack_election/__init__.py b/openstack_election/__init__.py index e69de29b..69a60664 100644 --- a/openstack_election/__init__.py +++ b/openstack_election/__init__.py @@ -0,0 +1 @@ +from . import require_py3 # noqa diff --git a/openstack_election/cmds/setup_election_config.py b/openstack_election/cmds/setup_election_config.py index 3f7037d4..9f0ecbba 100755 --- a/openstack_election/cmds/setup_election_config.py +++ b/openstack_election/cmds/setup_election_config.py @@ -23,8 +23,6 @@ import yaml from collections import OrderedDict from openstack_election.config import ISO_FMT -# Because python 2 has a revered OrderedDict ? -import openstack_election.require_py3 # noqa from openstack_election import utils ONE_WEEK = datetime.timedelta(weeks=1) diff --git a/tox.ini b/tox.ini index c03a324b..97a12688 100644 --- a/tox.ini +++ b/tox.ini @@ -22,10 +22,6 @@ commands = yamllint configuration.yaml [testenv:venv] commands = {posargs} -[testenv:venv2] -basepython = python2 -commands = {posargs} - [testenv:docs] commands = sphinx-build -v -W -b html -d doc/build/doctrees doc/source doc/build/html