From 22fa1bc4a7158689d46c996c1bfb154b14ea232d Mon Sep 17 00:00:00 2001 From: Ivan Anfimov Date: Mon, 17 Mar 2025 21:52:44 +0000 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: I849682e4d0537eca7a5d145184655eb55d45e150 --- requirements.txt | 6 +++--- setup.py | 9 --------- test-requirements.txt | 4 ---- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index 59e250e9b..2fdcebb41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -# 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. +# 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. alabaster<0.7.14 pbr>=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) diff --git a/test-requirements.txt b/test-requirements.txt index 110c1f29e..f78cc1769 100644 --- a/test-requirements.txt +++ b/test-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. - # Hacking already pins down pep8, pyflakes and flake8 hacking>=7.0.0,<7.1.0 # Apache-2.0 coverage>=4.0 # Apache-2.0