From 070bd04aea0aa5732e96a7fc7ead2855183c6143 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 5 Apr 2020 09:50:49 +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: * Wheel is not needed for python 3 only repo * Some other sections are obsolete - Update classifiers Change-Id: If1bd950d159a583d912d13e73113dae7f577e8eb --- setup.cfg | 12 ++++-------- setup.py | 9 --------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1ea5a708..3cd10545 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,27 +5,23 @@ description-file = README.rst author = OpenStack author-email = openstack-discuss@lists.openstack.org -home-page = https://github.com/openstack/monasca-common +home-page = https://opendev.org/openstack/monasca-common +python-requires = >=3.6 classifier = Intended Audience :: Information Technology Intended Audience :: System Administrators 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 -[global] -setup-hooks = - pbr.hooks.setup_hook - [files] packages = monasca_common [pbr] autodoc_index_modules = True - -[wheel] -universal = 1 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)