Browse Source

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
- Update requirements, no need for python_version anymore

Change-Id: I95a49a2941790e0df1fde38f253ba2516959ce80
tags/3.1.0^0
Andreas Jaeger 3 months ago
committed by Luigi Toscano
parent
commit
830d4607c3
3 changed files with 4 additions and 17 deletions
  1. +1
    -2
      doc/requirements.txt
  2. +3
    -6
      setup.cfg
  3. +0
    -9
      setup.py

+ 1
- 2
doc/requirements.txt View File

@@ -3,5 +3,4 @@
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD

+ 3
- 6
setup.cfg View File

@@ -7,6 +7,7 @@ license = Apache License, Version 2.0
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/python-saharaclient/latest/
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -14,13 +15,12 @@ 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

[global]
setup-hooks = pbr.hooks.setup_hook

[files]
packages =
saharaclient
@@ -161,6 +161,3 @@ openstack.data_processing.v2 =
dataprocessing_job_binary_update = saharaclient.osc.v2.job_binaries:UpdateJobBinary
dataprocessing_job_binary_delete = saharaclient.osc.v2.job_binaries:DeleteJobBinary
dataprocessing_job_binary_download = saharaclient.osc.v2.job_binaries:DownloadJobBinary

[wheel]
universal = 1

+ 0
- 9
setup.py View File

@@ -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)

Loading…
Cancel
Save