From 37984a6273ddf7141b4843f02bde2c33e21af87d Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 21 Feb 2020 08:47:18 +0100
Subject: [PATCH] Minor cleanup to test publishing

Remove now obsolete python 2.7.x support from setup.py,
update pbr version and make dependency explicit via requirements.txt

This change was pushed to test that the dependent change fixes
publishing content to https://service-types.openstack.org/ . So,
please merge once dependency is in and then we can check that publishing
to server works correctly.

Depends-On: https://review.opendev.org/709060
Change-Id: Iac2be67dbef5510679f5cda658b591e52d537051
---
 requirements.txt |  1 +
 setup.py         | 11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index dba1447..0fcfede 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
 hacking
 jsonschema
 requests
diff --git a/setup.py b/setup.py
index 782bb21..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>=1.8'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)