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
This commit is contained in:
Andreas Jaeger 2020-04-05 20:17:17 +02:00
parent 75273302ed
commit ca01a640cf
3 changed files with 5 additions and 11 deletions

View File

@ -6,4 +6,4 @@ pbr>=2.0 # Apache-2.0
# NOTE(mgoddard): Ansible 2.8.0 breaks ansible-lint. # NOTE(mgoddard): Ansible 2.8.0 breaks ansible-lint.
ansible>=2.7.0,<2.10.0 # GPLv3 ansible>=2.7.0,<2.10.0 # GPLv3
os-client-config # Apache-2.0 os-client-config # Apache-2.0
selinux;python_version>='3' # MIT selinux # MIT

View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack author = OpenStack
author-email = openstack-discuss@lists.openstack.org author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/tenks/latest/ home-page = https://docs.openstack.org/tenks/latest/
python-requires = >=3.6
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,6 +14,8 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7

View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)