openstack
/
rpm-packaging
Code Issues Proposed changes

Remove outdated mock and six dependencies 

Several projects dropped 3rd party mock and six dependencies
over the last few releases. update dependencies to match

Change-Id: I2f6fd96a079b5e63bfd256bc5225a28a4b90eebd
This commit is contained in:
Dirk Müller 2022-06-20 19:38:56 +02:00
parent 6e707b4e81
commit a158b0c44a
No known key found for this signature in database
25 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/barbican/barbican.spec.j2
View File

@ -35,7 +35,6 @@ BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('jsonschema') }}
BuildRequires: {{ py3('ldap3') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('neutronclient') }}
BuildRequires: {{ py3('oslo.concurrency') }}
BuildRequires: {{ py3('oslo.config') }}

1
openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
View File

@ -15,7 +15,6 @@ BuildRequires: openstack-macros
BuildRequires: {{ py3('betamax') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.messaging') }}
BuildRequires: {{ py3('oslo.utils') }}

1
openstack/cyborg/cyborg.spec.j2
View File

@ -22,7 +22,6 @@ BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('jsonpatch') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.context') }}
BuildRequires: {{ py3('oslo.db') }}

1
openstack/designate/designate.spec.j2
View File

@ -31,7 +31,6 @@ BuildRequires: openstack-macros
BuildRequires: {{ py3('dnspython') }}
BuildRequires: {{ py3('edgegrid-python') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.concurrency') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.context') }}

1
openstack/ec2-api/ec2-api.spec.j2
View File

@ -27,7 +27,6 @@ BuildRequires: {{ py3('python-cinderclient') }}
BuildRequires: {{ py3('python-glanceclient') }}
BuildRequires: {{ py3('httplib2') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('python-neutronclient') }}
BuildRequires: {{ py3('python-novaclient') }}
BuildRequires: {{ py3('oslo.cache') }}

3
openstack/freezer-api/freezer-api.spec.j2
View File

@ -23,7 +23,6 @@ BuildRequires: {{ py3('falcon') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('jsonschema') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.context') }}
BuildRequires: {{ py3('oslo.db') }}
@ -35,7 +34,6 @@ BuildRequires: {{ py3('oslo.serialization') }}
BuildRequires: {{ py3('oslo.upgradecheck') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('reno') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('testresources') }}
BuildRequires: {{ py3('testscenarios') }}
@ -77,7 +75,6 @@ Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.middleware') }}
Requires: {{ py3('oslo.policy') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('six') }}
%description -n python3-{{ pypi_name }}
API service for OpenStack Freezer: an OpenStack Swift incremental

2
openstack/freezer/freezer.spec.j2
View File

@ -29,7 +29,6 @@ BuildRequires: {{ py3('python-freezerclient') }}
BuildRequires: {{ py3('python-glanceclient') }}
BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('python-neutronclient') }}
BuildRequires: {{ py3('python-novaclient') }}
BuildRequires: {{ py3('os-brick') }}
@ -42,7 +41,6 @@ BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('psutil') }}
BuildRequires: {{ py3('pymongo') }}
BuildRequires: {{ py3('setuptools') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('python-swiftclient') }}
Requires: python3-{{ pypi_name }} = %{version}-%{release}

1
openstack/glance_store/glance_store.spec.j2
View File

@ -19,7 +19,6 @@ BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('jsonschema') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('os-brick') }}
BuildRequires: {{ py3('oslo.concurrency') }}
BuildRequires: {{ py3('oslo.config') }}

1
openstack/heat-dashboard/heat-dashboard.spec.j2
View File

@ -25,7 +25,6 @@ BuildRequires: {{ py3('XStatic-FileSaver') }}
BuildRequires: {{ py3('XStatic-JS-Yaml') }}
BuildRequires: {{ py3('XStatic-Json2yaml') }}
BuildRequires: {{ py3('python-heatclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('pbr') }}
Requires: {{ py2pkg('horizon-plugin-heat-ui') }} = %{version}
BuildArch: noarch

1
openstack/horizon/horizon.spec.j2
View File

@ -61,7 +61,6 @@ BuildRequires: {{ py3('django-pyscss') }}
BuildRequires: {{ py3('python-glanceclient') }}
BuildRequires: {{ py3('python-heatclient') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('netaddr') }}
BuildRequires: {{ py3('python-neutronclient') }}
BuildRequires: {{ py3('python-novaclient') }}

2
openstack/keystone/keystone.spec.j2
View File

@ -30,7 +30,6 @@ BuildRequires: {{ py3('jsonschema') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('ldappool') }}
BuildRequires: {{ py3('lxml') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oauthlib') }}
BuildRequires: {{ py3('oslo.cache') }}
BuildRequires: {{ py3('oslo.config') }}
@ -109,7 +108,6 @@ Requires: {{ py3('pysaml2') }}
Requires: {{ py3('python-memcached') }}
Requires: {{ py3('pytz') }}
Requires: {{ py3('scrypt') }}
Requires: {{ py3('six') }}
Requires: {{ py3('sqlalchemy-migrate') }}
Requires: {{ py3('stevedore') }}

1
openstack/magnum/magnum.spec.j2
View File

@ -36,7 +36,6 @@ BuildRequires: {{ py3('keystoneauth1') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('kubernetes') }}
BuildRequires: {{ py3('marathon') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('python-neutronclient') }}
BuildRequires: {{ py3('python-novaclient') }}
BuildRequires: {{ py3('python-octaviaclient') }}

2
openstack/os-apply-config/os-apply-config.spec.j2
View File

@ -13,7 +13,6 @@ URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('pystache') }}
BuildRequires: {{ py3('python-subunit') }}
@ -25,7 +24,6 @@ Requires: {{ py3('anyjson') }}
Requires: {{ py3('pbr') }}
Requires: {{ py3('pystache') }}
Requires: {{ py3('setuptools') }}
Requires: {{ py3('six') }}
BuildArch: noarch
%description

3
openstack/os-ken/os-ken.spec.j2
View File

@ -15,7 +15,6 @@ BuildRequires: openstack-macros
BuildRequires: {{ py3('Routes') }}
BuildRequires: {{ py3('WebOb') }}
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('msgpack') }}
BuildRequires: {{ py3('netaddr') }}
BuildRequires: {{ py3('nose') }}
@ -23,7 +22,6 @@ BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('ovs') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildArch: noarch
@ -41,7 +39,6 @@ Requires: {{ py3('netaddr') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('ovs') }}
Requires: {{ py3('pbr') }}
Requires: {{ py3('six') }}
%description -n {{ py2name(py_versions='py3') }}
A component-based software defined networking framework in OpenStack.

1
openstack/os-refresh-config/os-refresh-config.spec.j2
View File

@ -14,7 +14,6 @@ Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py3('dib-utils') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('psutil') }}
BuildRequires: {{ py3('stestr') }}

1
openstack/os-win/os-win.spec.j2
View File

@ -17,7 +17,6 @@ BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('ddt') }}
BuildRequires: {{ py3('devel') }}
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.concurrency') }}
BuildRequires: {{ py3('oslo.i18n') }}
BuildRequires: {{ py3('oslo.log') }}

1
openstack/oslotest/oslotest.spec.j2
View File

@ -28,7 +28,6 @@ better support for mocking results.
Summary: OpenStack test framework
Requires: {{ py3('debtcollector') }}
Requires: {{ py3('fixtures') }}
Requires: {{ py3('mock') }}
# NOTE: python-os-client-config is only needed for functional testing
# Requires: {{ py3('os-client-config') }}
Requires: {{ py3('python-subunit') }}

3
openstack/python-heatclient/python-heatclient.spec.j2
View File

@ -16,7 +16,6 @@ BuildRequires: {{ py3('PyYAML') }}
BuildRequires: {{ py3('cliff') }}
BuildRequires: {{ py3('devel') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('osc-lib') }}
BuildRequires: {{ py3('oslo.serialization') }}
BuildRequires: {{ py3('pbr') }}
@ -36,7 +35,6 @@ Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('requests') }}
Requires: {{ py3('six') }}
Requires: {{ py3('python-swiftclient') }}
BuildArch: noarch
@ -58,7 +56,6 @@ Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('requests') }}
Requires: {{ py3('six') }}
Requires: {{ py3('python-swiftclient') }}
%if 0%{?suse_version}
Obsoletes: {{ py2name(py_versions='py2') }} < 2.0.0

1
openstack/python-oneviewclient/python-oneviewclient.spec.j2
View File

@ -14,7 +14,6 @@ Source0: {{ source }}
# https://review.opendev.org/687019
Patch0: 0001-Switch-from-oslosphinx-to-openstackdocstheme.patch
BuildRequires: openstack-macros
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.serialization') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('python-subunit') }}

2
openstack/python-tackerclient/python-tackerclient.spec.j2
View File

@ -16,7 +16,6 @@ BuildRequires: {{ py3('cliff') }}
BuildRequires: {{ py3('ddt') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('osc-lib') }}
BuildRequires: {{ py3('oslo.i18n') }}
BuildRequires: {{ py3('oslo.log') }}
@ -37,7 +36,6 @@ Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('pbr') }}
Requires: {{ py3('requests') }}
Requires: {{ py3('simplejson') }}
Requires: {{ py3('six') }}
Requires: {{ py3('stevedore') }}
BuildArch: noarch

2
openstack/sahara/sahara.spec.j2
View File

@ -43,7 +43,6 @@ BuildRequires: {{ py3('python-keystoneclient') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('python-manilaclient') }}
BuildRequires: {{ py3('microversion_parse') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('python-neutronclient') }}
BuildRequires: {{ py3('python-novaclient') }}
BuildRequires: {{ py3('oslo.concurrency') }}
@ -66,7 +65,6 @@ BuildRequires: {{ py3('paramiko') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('requests') }}
BuildRequires: {{ py3('python-saharaclient') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('stevedore') }}
BuildRequires: {{ py3('python-swiftclient') }}

2
openstack/tooz/tooz.spec.j2
View File

@ -19,7 +19,6 @@ BuildRequires: openstack-macros
BuildRequires: {{ py3('fasteners') }}
BuildRequires: {{ py3('fixtures') }}
BuildRequires: {{ py3('futurist') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('oslo.serialization') }}
BuildRequires: {{ py3('oslo.utils') }}
BuildRequires: {{ py3('pbr') }}
@ -45,7 +44,6 @@ Requires: {{ py3('futurist') }}
Requires: {{ py3('msgpack') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('six') }}
Requires: {{ py3('stevedore') }}
Requires: {{ py3('tenacity') }}
Requires: {{ py3('voluptuous') }}

2
openstack/vmware-nsx/vmware-nsx.spec.j2
View File

@ -18,7 +18,6 @@ Requires: {{ py3('SQLAlchemy') }}
Requires: {{ py3('decorator') }}
Requires: {{ py3('eventlet') }}
Requires: {{ py3('httplib2') }}
Requires: {{ py3('mock') }}
Requires: {{ py3('netaddr') }}
Requires: {{ py3('python-openstackclient') }}
Requires: {{ py3('osc-lib') }}
@ -29,7 +28,6 @@ Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('six') }}
Requires: {{ py3('stevedore') }}
Requires: {{ py3('tenacity') }}
Requires: {{ py3('vmware-nsxlib') }}

2
openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
View File

@ -17,7 +17,6 @@ BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: {{ py3('decorator') }}
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('neutron-lib') }}
BuildRequires: {{ py3('oslo.log') }}
BuildRequires: {{ py3('oslo.service') }}
@ -47,7 +46,6 @@ Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.service') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('pyOpenSSL') }}
Requires: {{ py3('six') }}
Requires: {{ py3('tenacity') }}
%description -n python3-vmware-nsxlib

2
openstack/watcher/watcher.spec.j2
View File

@ -44,7 +44,6 @@ BuildRequires: {{ py3('keystoneclient') }}
BuildRequires: {{ py3('keystonemiddleware') }}
BuildRequires: {{ py3('lxml') }}
BuildRequires: {{ py3('microversion_parse') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: {{ py3('monascaclient') }}
BuildRequires: {{ py3('networkx') }}
BuildRequires: {{ py3('neutronclient') }}
@ -67,7 +66,6 @@ BuildRequires: {{ py3('oslo.versionedobjects') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('pecan') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('stevedore') }}
BuildRequires: {{ py3('taskflow') }}