From 2c649d319eb1e3591f1c1556a8edd0cc6c27436d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 7 Apr 2020 18:42:27 +0200 Subject: [PATCH] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove obsolete sections from setup.cfg - Update classifiers Change-Id: Idc93d9004edfb89c3c28bfed06af93ec75b2b644 --- setup.cfg | 12 +++--------- setup.py | 9 --------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/setup.cfg b/setup.cfg index cce2a76d..c0132e48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack Qinling Team author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/qinling/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,6 +14,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -46,12 +49,3 @@ oslo.config.opts.defaults = tempest.test_plugins = qinling_test = qinling_tempest_plugin.plugin:QinlingTempestPlugin - -[build_sphinx] -all-files = 1 -warning-is-error = 1 -source-dir = doc/source -build-dir = doc/build - -[upload_sphinx] -upload-dir = doc/build/html diff --git a/setup.py b/setup.py index 566d8443..cd35c3c3 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)