From 0d5c948a74d8cb1eb6dcf8ac2a4459e7f80c72ae Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 12 Jan 2024 17:55: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: I8853a4221c6da78f860e821be4a063176c5734f3 --- requirements.txt | 4 ---- setup.py | 9 --------- 2 files changed, 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 32ded5c76..a8cb2f147 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +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. - # See: https://bugs.launchpad.net/pbr/+bug/1384919 for why this is here... pbr!=2.1.0,>=2.0.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 566d84432..cd35c3c35 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)