From ca01a640cf8713636b42e4e1b41bdb9d2a550865 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 5 Apr 2020 20:17:17 +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 - Update classifiers - Update requirements, no need for python_version anymore Change-Id: I9ee2b80fd7edfc8e68cf2265cf9a5dadb0691f09 --- requirements.txt | 2 +- setup.cfg | 3 +++ setup.py | 11 +---------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index cf36bc4..8f73bf4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ pbr>=2.0 # Apache-2.0 # NOTE(mgoddard): Ansible 2.8.0 breaks ansible-lint. ansible>=2.7.0,<2.10.0 # GPLv3 os-client-config # Apache-2.0 -selinux;python_version>='3' # MIT +selinux # MIT diff --git a/setup.cfg b/setup.cfg index 3cf73b9..af60962 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/tenks/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 d145fe0..01b1e4a 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'], + setup_requires=['pbr>=2.0.0'], pbr=True)