summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-04-04 17:11:37 +0200
committerLuigi Toscano <ltoscano@redhat.com>2020-04-07 14:51:08 +0200
commit830d4607c3f20910c5a044ab5aa4d91e6bdb042a (patch)
tree68830e1248f2364a11510f73205e47f383692103
parentcca4f4d0c8a33a776e17413f5fda94c088b6a233 (diff)
downloadpython-saharaclient-830d4607c3f20910c5a044ab5aa4d91e6bdb042a.tar.gz
Cleanup py27 supportussuri-em3.1.0
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
-rw-r--r--doc/requirements.txt3
-rw-r--r--setup.cfg9
-rw-r--r--setup.py9
3 files changed, 4 insertions, 17 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 3cf3164..12d1957 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -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
diff --git a/setup.cfg b/setup.cfg
index 704b62c..b8fc9b6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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
diff --git a/setup.py b/setup.py
index 566d844..cd35c3c 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)