From 8ac18a8ee1f15eb77ac15cedbb4b4765ad2241f0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 12 Jan 2024 17:44:09 +0900
Subject: [PATCH] Cleanup setup.py and requirements

- Python 2 is no longer supported
- setup.py is no longer managed by the global tooling
- Recent pip does not require appropriate order in requirement files

Change-Id: Iaa1aa0022e207cceb26ed45474bc6edfbbec4faa
---
 requirements.txt      | 4 ----
 setup.py              | 9 ---------
 test-requirements.txt | 3 ---
 3 files changed, 16 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 413a522f2d9..687503daa7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,6 @@
 # Requirements lower bounds listed here are our best effort to keep them up to
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
-
-# 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.
 pbr>=4.0.0 # Apache-2.0
 
 Paste>=2.0.2 # MIT
diff --git a/setup.py b/setup.py
index 566d84432ee..cd35c3c35bf 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)
diff --git a/test-requirements.txt b/test-requirements.txt
index ab952537fc4..cdf72fd136a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,3 @@
-# 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.
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD