From f95fe41f651deb78c6e4c92304b23f6a1cb1ac3e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Oct 2021 23:43:14 +0200 Subject: [PATCH] remove six usage this was removed upstream in the xena releases Change-Id: I5011586e7960e73926bdb0eb58bfe903b391fd85 --- openstack/cliff/cliff.spec.j2 | 1 - openstack/openstacksdk/openstacksdk.spec.j2 | 2 -- openstack/oslo.cache/oslo.cache.spec.j2 | 2 -- openstack/oslo.config/oslo.config.spec.j2 | 2 -- openstack/oslo.middleware/oslo.middleware.spec.j2 | 2 -- openstack/oslo.reports/oslo.reports.spec.j2 | 2 -- openstack/oslo.serialization/oslo.serialization.spec.j2 | 1 - openstack/oslo.utils/oslo.utils.spec.j2 | 1 - openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 | 1 - openstack/oslo.vmware/oslo.vmware.spec.j2 | 1 - openstack/python-cinderclient/python-cinderclient.spec.j2 | 1 - openstack/python-freezerclient/python-freezerclient.spec.j2 | 1 - openstack/python-glanceclient/python-glanceclient.spec.j2 | 1 - openstack/python-manilaclient/python-manilaclient.spec.j2 | 1 - openstack/python-mistralclient/python-mistralclient.spec.j2 | 1 - openstack/python-novaclient/python-novaclient.spec.j2 | 1 - openstack/python-openstackclient/python-openstackclient.spec.j2 | 1 - openstack/python-senlinclient/python-senlinclient.spec.j2 | 1 - 18 files changed, 23 deletions(-) diff --git a/openstack/cliff/cliff.spec.j2 b/openstack/cliff/cliff.spec.j2 index 1730bc399..fb80407b6 100644 --- a/openstack/cliff/cliff.spec.j2 +++ b/openstack/cliff/cliff.spec.j2 @@ -39,7 +39,6 @@ Requires: {{ py3('PyYAML') }} Requires: {{ py3('autopage') }} Requires: {{ py3('cmd2') }} Requires: {{ py3('pyparsing') }} -Requires: {{ py3('six') }} Requires: {{ py3('stevedore') }} %description -n {{ py2name(py_versions='py3') }} diff --git a/openstack/openstacksdk/openstacksdk.spec.j2 b/openstack/openstacksdk/openstacksdk.spec.j2 index 76f821f44..d81d4953a 100644 --- a/openstack/openstacksdk/openstacksdk.spec.j2 +++ b/openstack/openstacksdk/openstacksdk.spec.j2 @@ -37,7 +37,6 @@ BuildRequires: {{ py3('pbr') }} BuildRequires: {{ py3('python-subunit') }} BuildRequires: {{ py3('requests-mock') }} BuildRequires: {{ py3('requestsexceptions') }} -BuildRequires: {{ py3('six') }} BuildRequires: {{ py3('statsd') }} BuildRequires: {{ py3('stestr') }} BuildRequires: {{ py3('stevedore') }} @@ -71,7 +70,6 @@ Requires: {{ py3('munch') }} Requires: {{ py3('netifaces') }} Requires: {{ py3('os-service-types') }} Requires: {{ py3('requestsexceptions') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 1.0.0 %endif diff --git a/openstack/oslo.cache/oslo.cache.spec.j2 b/openstack/oslo.cache/oslo.cache.spec.j2 index 3f209254f..3424eec7e 100644 --- a/openstack/oslo.cache/oslo.cache.spec.j2 +++ b/openstack/oslo.cache/oslo.cache.spec.j2 @@ -22,7 +22,6 @@ BuildRequires: {{ py3('oslotest') }} BuildRequires: {{ py3('pbr') }} BuildRequires: {{ py3('pymongo') }} BuildRequires: {{ py3('python-memcached') }} -BuildRequires: {{ py3('six') }} BuildRequires: {{ py3('stestr') }} BuildArch: noarch @@ -40,7 +39,6 @@ Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.log') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('python-memcached') }} -Requires: {{ py3('six') }} %description -n {{ py2name(py_versions='py3') }} oslo.cache aims to provide a generic caching mechanism for OpenStack projects diff --git a/openstack/oslo.config/oslo.config.spec.j2 b/openstack/oslo.config/oslo.config.spec.j2 index 287b3bbb8..5712e6ad1 100644 --- a/openstack/oslo.config/oslo.config.spec.j2 +++ b/openstack/oslo.config/oslo.config.spec.j2 @@ -25,7 +25,6 @@ BuildRequires: {{ py3('pbr') }} BuildRequires: {{ py3('requests') }} BuildRequires: {{ py3('requests-mock') }} BuildRequires: {{ py3('rfc3986') }} -BuildRequires: {{ py3('six') }} BuildRequires: {{ py3('stestr') }} BuildRequires: {{ py3('stevedore') }} BuildRequires: {{ py3('testscenarios') }} @@ -50,7 +49,6 @@ Requires: {{ py3('netaddr') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('requests') }} Requires: {{ py3('rfc3986') }} -Requires: {{ py3('six') }} Requires: {{ py3('stevedore') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 8.0.1 diff --git a/openstack/oslo.middleware/oslo.middleware.spec.j2 b/openstack/oslo.middleware/oslo.middleware.spec.j2 index f68d8256a..5a67fed39 100644 --- a/openstack/oslo.middleware/oslo.middleware.spec.j2 +++ b/openstack/oslo.middleware/oslo.middleware.spec.j2 @@ -26,7 +26,6 @@ BuildRequires: {{ py3('oslo.serialization') }} BuildRequires: {{ py3('oslo.utils') }} BuildRequires: {{ py3('oslotest') }} BuildRequires: {{ py3('pbr') }} -BuildRequires: {{ py3('six') }} BuildRequires: {{ py3('statsd') }} BuildRequires: {{ py3('stestr') }} BuildRequires: {{ py3('stevedore') }} @@ -50,7 +49,6 @@ Requires: {{ py3('oslo.context') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('six') }} Requires: {{ py3('statsd') }} Requires: {{ py3('stevedore') }} diff --git a/openstack/oslo.reports/oslo.reports.spec.j2 b/openstack/oslo.reports/oslo.reports.spec.j2 index 0f201318c..e3f818e76 100644 --- a/openstack/oslo.reports/oslo.reports.spec.j2 +++ b/openstack/oslo.reports/oslo.reports.spec.j2 @@ -22,7 +22,6 @@ BuildRequires: {{ py3('oslo.utils') }} BuildRequires: {{ py3('oslotest') }} BuildRequires: {{ py3('pbr') }} BuildRequires: {{ py3('psutil') }} -BuildRequires: {{ py3('six') }} BuildRequires: {{ py3('stestr') }} BuildArch: noarch @@ -37,7 +36,6 @@ Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('psutil') }} -Requires: {{ py3('six') }} %description -n {{ py2name(py_versions='py3') }} The project oslo.reports hosts a general purpose error report generation diff --git a/openstack/oslo.serialization/oslo.serialization.spec.j2 b/openstack/oslo.serialization/oslo.serialization.spec.j2 index a5354b978..bc7318a2f 100644 --- a/openstack/oslo.serialization/oslo.serialization.spec.j2 +++ b/openstack/oslo.serialization/oslo.serialization.spec.j2 @@ -31,7 +31,6 @@ Summary: OpenStack serialization library Requires: {{ py3('msgpack') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('pytz') }} -Requires: {{ py3('six') }} %description -n {{ py2name(py_versions='py3') }} The oslo.serialization library provides support for representing objects diff --git a/openstack/oslo.utils/oslo.utils.spec.j2 b/openstack/oslo.utils/oslo.utils.spec.j2 index e3385d7fe..df8101f45 100644 --- a/openstack/oslo.utils/oslo.utils.spec.j2 +++ b/openstack/oslo.utils/oslo.utils.spec.j2 @@ -44,7 +44,6 @@ Requires: {{ py3('netifaces') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('pyparsing') }} Requires: {{ py3('pytz') }} -Requires: {{ py3('six') }} %description -n {{ py2name(py_versions='py3') }} The oslo.utils library provides support for common utility type functions, diff --git a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 index 4fd5c5901..730dd8a96 100644 --- a/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 +++ b/openstack/oslo.versionedobjects/oslo.versionedobjects.spec.j2 @@ -48,7 +48,6 @@ Requires: {{ py3('oslo.log') }} Requires: {{ py3('oslo.messaging') }} Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('six') }} %description -n {{ py2name(py_versions='py3') }} oslo.versionedobjects library deals with DB schema being at different versions diff --git a/openstack/oslo.vmware/oslo.vmware.spec.j2 b/openstack/oslo.vmware/oslo.vmware.spec.j2 index 0a2aa06bd..d06ef30f4 100644 --- a/openstack/oslo.vmware/oslo.vmware.spec.j2 +++ b/openstack/oslo.vmware/oslo.vmware.spec.j2 @@ -52,7 +52,6 @@ Requires: {{ py3('oslo.context') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('requests') }} -Requires: {{ py3('six') }} Requires: {{ py3('stevedore') }} Requires: {{ py3('suds-community') }} Requires: {{ py3('urllib3') }} diff --git a/openstack/python-cinderclient/python-cinderclient.spec.j2 b/openstack/python-cinderclient/python-cinderclient.spec.j2 index bfa03fd2a..2642a93c0 100644 --- a/openstack/python-cinderclient/python-cinderclient.spec.j2 +++ b/openstack/python-cinderclient/python-cinderclient.spec.j2 @@ -40,7 +40,6 @@ Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('requests') }} Requires: {{ py3('simplejson') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 6.0.0 %endif diff --git a/openstack/python-freezerclient/python-freezerclient.spec.j2 b/openstack/python-freezerclient/python-freezerclient.spec.j2 index d54501bf0..65fb3bbae 100644 --- a/openstack/python-freezerclient/python-freezerclient.spec.j2 +++ b/openstack/python-freezerclient/python-freezerclient.spec.j2 @@ -36,7 +36,6 @@ Requires: {{ py3('keystoneauth1') }} Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('pbr') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 3.0.0 %endif diff --git a/openstack/python-glanceclient/python-glanceclient.spec.j2 b/openstack/python-glanceclient/python-glanceclient.spec.j2 index c168e4506..a82d07c63 100644 --- a/openstack/python-glanceclient/python-glanceclient.spec.j2 +++ b/openstack/python-glanceclient/python-glanceclient.spec.j2 @@ -43,7 +43,6 @@ Requires: {{ py3('oslo.utils') }} Requires: {{ py3('pbr') }} Requires: {{ py3('pyOpenSSL') }} Requires: {{ py3('requests') }} -Requires: {{ py3('six') }} Requires: {{ py3('warlock') }} Requires: {{ py3('wrapt') }} %if 0%{?suse_version} diff --git a/openstack/python-manilaclient/python-manilaclient.spec.j2 b/openstack/python-manilaclient/python-manilaclient.spec.j2 index 0b5df885c..73a521167 100644 --- a/openstack/python-manilaclient/python-manilaclient.spec.j2 +++ b/openstack/python-manilaclient/python-manilaclient.spec.j2 @@ -41,7 +41,6 @@ Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('requests') }} Requires: {{ py3('simplejson') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 2.0.0 %endif diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2 index 90bff94d7..ae3fa7a33 100644 --- a/openstack/python-mistralclient/python-mistralclient.spec.j2 +++ b/openstack/python-mistralclient/python-mistralclient.spec.j2 @@ -40,7 +40,6 @@ Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('osprofiler') }} Requires: {{ py3('requests') }} -Requires: {{ py3('six') }} Requires: {{ py3('stevedore') }} Conflicts: %{oldpython}-mistralclient < %version diff --git a/openstack/python-novaclient/python-novaclient.spec.j2 b/openstack/python-novaclient/python-novaclient.spec.j2 index a17325ec3..8a101d502 100644 --- a/openstack/python-novaclient/python-novaclient.spec.j2 +++ b/openstack/python-novaclient/python-novaclient.spec.j2 @@ -46,7 +46,6 @@ Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('pbr') }} Requires: {{ py3('simplejson') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 16.0.0 %endif diff --git a/openstack/python-openstackclient/python-openstackclient.spec.j2 b/openstack/python-openstackclient/python-openstackclient.spec.j2 index 880c7132b..20d0e6e3b 100644 --- a/openstack/python-openstackclient/python-openstackclient.spec.j2 +++ b/openstack/python-openstackclient/python-openstackclient.spec.j2 @@ -53,7 +53,6 @@ Requires: {{ py3('openstacksdk') }} Requires: {{ py3('osc-lib') }} Requires: {{ py3('oslo.i18n') }} Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('six') }} %if 0%{?suse_version} Obsoletes: {{ py2name(py_versions='py2') }} < 4.0.0 %endif diff --git a/openstack/python-senlinclient/python-senlinclient.spec.j2 b/openstack/python-senlinclient/python-senlinclient.spec.j2 index 80f9c6f9f..fc65339c0 100644 --- a/openstack/python-senlinclient/python-senlinclient.spec.j2 +++ b/openstack/python-senlinclient/python-senlinclient.spec.j2 @@ -53,7 +53,6 @@ Requires: {{ py3('oslo.serialization') }} Requires: {{ py3('oslo.utils') }} Requires: {{ py3('pbr') }} Requires: {{ py3('requests') }} -Requires: {{ py3('six') }} %description -n python3-senlinclient OpenStack Clustering service Provisioning API Client Library