From 3f97e9844ae3c366a19e4c141504e585afd80320 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 4 Apr 2020 12:30:45 +0200 Subject: [PATCH] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Remove obsolete sections from setup.cfg - Update classifiers Change-Id: I79e3c540b56b024c7d01e4c916cdd79da9000331 --- setup.cfg | 5 ++--- setup.py | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/setup.cfg b/setup.cfg index 84aedd6..3cac389 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -267,9 +269,6 @@ keystoneauth1.plugin = cliff.formatter.list = df-to-csv = cloudkittyclient.format:DataframeToCsvFormatter -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = cloudkittyclient/locale domain = python-cloudkittyclient diff --git a/setup.py b/setup.py index 566d844..cd35c3c 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.0'], pbr=True)