From d6e5ad77660f80d53cd00690f2b964d6d079fe4a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 8 Apr 2020 11:51:49 +0200 Subject: [PATCH] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Remove obsolete sections from setup.cfg - Remove install_command from tox.ini, the default is fine Change-Id: I693afdb7097b156935424c5549e1b22a08bf2773 --- setup.cfg | 3 --- setup.py | 9 --------- tox.ini | 1 - 3 files changed, 13 deletions(-) diff --git a/setup.cfg b/setup.cfg index cfbf40c21..93aa256b3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,6 +10,3 @@ classifier = Intended Audience :: Developers License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py index 3887303fb..eb4bd4303 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0'], pbr=True) diff --git a/tox.ini b/tox.ini index 40d6e73b2..056832337 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,6 @@ skipsdist = True basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} -install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/doc/requirements.txt whitelist_externals = find