From e6ed0b1ef292d73d2cb06daad6f18b9f0eb7bd56 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 29 Aug 2018 16:16:47 +1000 Subject: [PATCH] Python3 by default Set all the tox environments to be python3 *except* venv2. Set the trove data mostly because we can. Change-Id: Ib65e84c7da16683f70657a3bc8e9b9ccdb8f1c8a --- setup.cfg | 5 +++-- tox.ini | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index e359f2ee..04fe944e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,8 +12,9 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 [files] packages = openstack_election diff --git a/tox.ini b/tox.ini index 16e942cf..9bfd785a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ minversion = 2.0 skipsdist = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} @@ -25,10 +26,6 @@ commands = {posargs} basepython = python2 commands = {posargs} -[testenv:venv3] -basepython = python3 -commands = {posargs} - [testenv:docs] commands = python setup.py build_sphinx