From 3a69bd353b66f82dfbedd21e416616368cf4cb52 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 7 May 2024 12:54:12 +0900 Subject: [PATCH] Remove extras and enum34 Trove does not use extras and it was removed from the top-level requirements by 2cc36175c8dec51824c716304a7dd16c3d1038ef . Also enum34 is no longer required because now the minimum supported python version is 3.8 . Change-Id: I62c04ccc3c8157a86fa8b5a307983ba0796111b0 --- .../scripts/files/requirements/fedora-requirements.txt | 5 ----- .../scripts/files/requirements/ubuntu-requirements.txt | 5 ----- 2 files changed, 10 deletions(-) diff --git a/integration/scripts/files/requirements/fedora-requirements.txt b/integration/scripts/files/requirements/fedora-requirements.txt index aa42fb51c9..c388168198 100644 --- a/integration/scripts/files/requirements/fedora-requirements.txt +++ b/integration/scripts/files/requirements/fedora-requirements.txt @@ -1,9 +1,5 @@ -# 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. unittest2 testtools -extras python-novaclient>=2.22.0 python-swiftclient>=2.2.0 python-cinderclient>=1.1.0 @@ -25,6 +21,5 @@ oslo.log>=1.8.0 # Apache-2.0 osprofiler>=0.3.0 oslo.concurrency>=1.8.0 # Apache-2.0 pexpect>=3.1,!=3.3 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD cryptography>=2.1.4 # BSD/Apache-2.0 xmltodict>=0.10.1 # MIT diff --git a/integration/scripts/files/requirements/ubuntu-requirements.txt b/integration/scripts/files/requirements/ubuntu-requirements.txt index 9c322b05dd..51c0af4da5 100644 --- a/integration/scripts/files/requirements/ubuntu-requirements.txt +++ b/integration/scripts/files/requirements/ubuntu-requirements.txt @@ -1,9 +1,5 @@ -# 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. unittest2 testtools -extras python-novaclient>=2.18.0 python-swiftclient>=2.2.0 python-cinderclient>=1.1.0 @@ -23,6 +19,5 @@ oslo.service>=0.1.0 # Apache-2.0 oslo.utils>=1.1.0 osprofiler>=0.3.0 oslo.concurrency>=0.3.0 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD cryptography>=2.1.4 # BSD/Apache-2.0 xmltodict>=0.10.1 # MIT