From ca5b47f332a7ae41bb165999e5316b04f6daaffd Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 5 Apr 2020 10:33:09 +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
- 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: If7ca070c556f819befd9d78e096536b23df4d5f4
---
 doc/requirements.txt |  3 +--
 setup.cfg            | 15 +++------------
 setup.py             |  9 ---------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index b5107c6..72236a6 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,7 +4,6 @@
 openstackdocstheme>=1.20.0 # Apache-2.0
 os-api-ref>=1.4.0 # 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
 sphinxcontrib-httpdomain>=1.3.0 # BSD
 whereto>=0.3.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index f5ff076..30ea305 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,8 +3,11 @@ name = sahara-plugin-spark
 summary = Spark Plugin for Sahara Project
 description-file = README.rst
 license = Apache Software License
+python-requires = >=3.6
 classifiers =
     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
@@ -17,9 +20,6 @@ author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/sahara/latest/
 
-[global]
-setup-hooks = pbr.hooks.setup_hook
-
 [files]
 packages =
     sahara_plugin_spark
@@ -28,12 +28,6 @@ packages =
 sahara.cluster.plugins =
     spark   = sahara_plugin_spark.plugins.spark.plugin:SparkProvider
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [compile_catalog]
 directory = sahara_plugin_spark/locale
 domain = sahara_plugin_spark
@@ -47,6 +41,3 @@ input_file = sahara_plugin_spark/locale/sahara_plugin_spark.pot
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = sahara_plugin_spark/locale/sahara_plugin_spark.pot
-
-[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)