From 6f867437ebf0d337f3b32cf8367f3485f47331ac Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 27 Nov 2023 23:09:34 +0900 Subject: [PATCH] Remove workaround for Python 2 ... because Python 2 is no longer supported. Also remove a few old comments which are no longer valid. Change-Id: I2260a08a0bada42300ca4058b8085ecf98d770fb --- requirements.txt | 3 --- setup.py | 8 -------- test-requirements.txt | 3 --- 3 files changed, 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1ddb7c4..ac4bb80 100644 --- a/requirements.txt +++ b/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. pbr!=2.1.0,>=2.0.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 566d844..0fa6510 100644 --- a/setup.py +++ b/setup.py @@ -13,16 +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'], diff --git a/test-requirements.txt b/test-requirements.txt index 154ac97..4c886b9 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. hacking>=4.0.0,<4.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0