From 1037400faa5b6ec663cba9bdc4e6ea7532edb969 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 4 Apr 2020 16:58:39 +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
- Remove html_last_updated_fmt from conf.py, this is not needed with
  openstackdocstheme anymore

Change-Id: I5d63389fbc4588700e09b06db85b52e7aab4a219
---
 doc/requirements.txt        | 2 +-
 doc/source/conf.py          | 6 ------
 releasenotes/source/conf.py | 8 --------
 setup.cfg                   | 3 +++
 setup.py                    | 9 ---------
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 8380e8e6..8b59392a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 reno>=2.5.0 # Apache-2.0
 openstackdocstheme>=1.30.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5748a248..37eec380 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -78,12 +78,6 @@ modindex_common_prefix = ['mistralclient.']
 # a list of builtin themes.
 html_theme = 'openstackdocs'
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 html_title = 'MistralClient'
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index f39eeb2b..2d6a9e12 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -67,14 +67,6 @@ release = ''
 # for a list of supported languages.
 # language = None
 
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-# today = ''
-# Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = []
diff --git a/setup.cfg b/setup.cfg
index 3f1ed64a..75d44535 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,8 +3,11 @@ name = python-mistralclient
 summary = Mistral Client Library
 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
diff --git a/setup.py b/setup.py
index 566d8443..cd35c3c3 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)