From 782cf4cb5f3870a648e1567d18164316741f3aa5 Mon Sep 17 00:00:00 2001 From: zhangbailin Date: Sun, 5 Apr 2020 09:31:41 +0800 Subject: [PATCH] Cleanup py27 support This commit cleanup below: - 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 This commit also change the home-page refer to https://docs.openstack.org/cyborg/latest/ Change-Id: I8eaa4d7bbdc8eea67f3c367d482ed80753284825 --- setup.cfg | 5 ++++- setup.py | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4b41892a..d62ff167 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,8 @@ description-file = README.rst author = OpenStack author-email = openstack-discuss@lists.openstack.org -home-page = https://www.openstack.org/ +home-page = https://docs.openstack.org/cyborg/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 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)