diff --git a/openstack/os-client-config/os-client-config.spec.j2 b/openstack/os-client-config/os-client-config.spec.j2 index a9c7dd438..0b7506dc4 100644 --- a/openstack/os-client-config/os-client-config.spec.j2 +++ b/openstack/os-client-config/os-client-config.spec.j2 @@ -10,7 +10,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/%{sname} Source0: https://files.pythonhosted.org/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('PyYAML') }} diff --git a/openstack/os-collect-config/os-collect-config.spec.j2 b/openstack/os-collect-config/os-collect-config.spec.j2 index 2ca42ee7a..d0953b776 100644 --- a/openstack/os-collect-config/os-collect-config.spec.j2 +++ b/openstack/os-collect-config/os-collect-config.spec.j2 @@ -10,7 +10,6 @@ Source0: https://files.pythonhosted.org/packages/source/o/%{sname}/%{snam Source1: os-collect-config.service Source2: os-collect-config.conf BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('python-heatclient') }} BuildRequires: {{ py2pkg('python-keystoneclient') }} diff --git a/openstack/os-faults/os-faults.spec.j2 b/openstack/os-faults/os-faults.spec.j2 index 5bcd8f97f..2bc11e91b 100644 --- a/openstack/os-faults/os-faults.spec.j2 +++ b/openstack/os-faults/os-faults.spec.j2 @@ -18,7 +18,6 @@ BuildRequires: {{ py2pkg('appdirs') }} #BuildRequires: {{ py2pkg('click', ('>=', '6.7')) }} BuildRequires: {{ py2pkg('click') }} BuildRequires: {{ py2pkg('ddt') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('iso8601') }} BuildRequires: {{ py2pkg('jsonschema') }} BuildRequires: {{ py2pkg('libvirt-python') }} diff --git a/openstack/os-refresh-config/os-refresh-config.spec.j2 b/openstack/os-refresh-config/os-refresh-config.spec.j2 index ce633c369..c218a74ac 100644 --- a/openstack/os-refresh-config/os-refresh-config.spec.j2 +++ b/openstack/os-refresh-config/os-refresh-config.spec.j2 @@ -8,7 +8,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/%{sname} Source0: https://files.pythonhosted.org/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('dib-utils') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('mock') }} diff --git a/openstack/oslo.privsep/oslo.privsep.spec.j2 b/openstack/oslo.privsep/oslo.privsep.spec.j2 index 0a9747ff5..dafbe51e1 100644 --- a/openstack/oslo.privsep/oslo.privsep.spec.j2 +++ b/openstack/oslo.privsep/oslo.privsep.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('Sphinx', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('cffi', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('eventlet', py_versions=['py2', 'py3']) }} diff --git a/openstack/oslosphinx/oslosphinx.spec.j2 b/openstack/oslosphinx/oslosphinx.spec.j2 index 77aff818f..a6cbdcf07 100644 --- a/openstack/oslosphinx/oslosphinx.spec.j2 +++ b/openstack/oslosphinx/oslosphinx.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('pbr') }} diff --git a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 b/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 index dbf6699bd..2653e1402 100644 --- a/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 +++ b/openstack/oswin-tempest-plugin/oswin-tempest-plugin.spec.j2 @@ -17,7 +17,6 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/{{ pypi_name }} Source0: {{ source|basename }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('setuptools') }} Requires: {{ py2pkg('Tempest') }} diff --git a/openstack/pbr/pbr.spec.j2 b/openstack/pbr/pbr.spec.j2 index 78460130d..b3808d41d 100644 --- a/openstack/pbr/pbr.spec.j2 +++ b/openstack/pbr/pbr.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://pypi.org/project/pbr Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('setuptools') }} BuildArch: noarch diff --git a/openstack/pycadf/pycadf.spec.j2 b/openstack/pycadf/pycadf.spec.j2 index d8431918d..355cea4a1 100644 --- a/openstack/pycadf/pycadf.spec.j2 +++ b/openstack/pycadf/pycadf.spec.j2 @@ -13,7 +13,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/pycadf Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.config', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('oslo.serialization', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 index 221b26b33..5c22b5e93 100644 --- a/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 +++ b/openstack/python-cloudkittyclient/python-cloudkittyclient.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('PrettyTable', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('cliff', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-congressclient/python-congressclient.spec.j2 b/openstack/python-congressclient/python-congressclient.spec.j2 index 677ac4ef1..b39f34680 100644 --- a/openstack/python-congressclient/python-congressclient.spec.j2 +++ b/openstack/python-congressclient/python-congressclient.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/%{name} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('jsonpatch') }} BuildRequires: {{ py2pkg('mock') }} diff --git a/openstack/python-designateclient/python-designateclient.spec.j2 b/openstack/python-designateclient/python-designateclient.spec.j2 index b99eeb3c3..6761ffe3e 100644 --- a/openstack/python-designateclient/python-designateclient.spec.j2 +++ b/openstack/python-designateclient/python-designateclient.spec.j2 @@ -8,7 +8,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/%{sname} Source0: https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('jsonschema') }} BuildRequires: {{ py2pkg('python-keystoneclient') }} BuildRequires: {{ py2pkg('mock') }} diff --git a/openstack/python-distilclient/python-distilclient.spec.j2 b/openstack/python-distilclient/python-distilclient.spec.j2 index 4f9ace143..aab32fb4c 100644 --- a/openstack/python-distilclient/python-distilclient.spec.j2 +++ b/openstack/python-distilclient/python-distilclient.spec.j2 @@ -9,7 +9,6 @@ Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name} BuildRequires: openstack-macros BuildRequires: {{ py2pkg('Tempest') }} BuildRequires: {{ py2pkg('ddt') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('keyring') }} BuildRequires: {{ py2pkg('python-keystoneclient') }} diff --git a/openstack/python-dracclient/python-dracclient.spec.j2 b/openstack/python-dracclient/python-dracclient.spec.j2 index a4d395887..1438559b9 100644 --- a/openstack/python-dracclient/python-dracclient.spec.j2 +++ b/openstack/python-dracclient/python-dracclient.spec.j2 @@ -9,7 +9,6 @@ URL: https://launchpad.net/%{sname} Source0: https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('coverage') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('lxml') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('pbr') }} diff --git a/openstack/python-freezerclient/python-freezerclient.spec.j2 b/openstack/python-freezerclient/python-freezerclient.spec.j2 index 85fc8f535..577678c7d 100644 --- a/openstack/python-freezerclient/python-freezerclient.spec.j2 +++ b/openstack/python-freezerclient/python-freezerclient.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('cliff', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-keystoneclient', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-magnumclient/python-magnumclient.spec.j2 b/openstack/python-magnumclient/python-magnumclient.spec.j2 index 9b6ec5dc4..b57f16a4c 100644 --- a/openstack/python-magnumclient/python-magnumclient.spec.j2 +++ b/openstack/python-magnumclient/python-magnumclient.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('PrettyTable', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('cryptography', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('decorator', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2 index fa2c68009..4e68b8ee8 100644 --- a/openstack/python-mistralclient/python-mistralclient.spec.j2 +++ b/openstack/python-mistralclient/python-mistralclient.spec.j2 @@ -8,7 +8,6 @@ URL: https://launchpad.net/%{name} Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('PyYAML') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('nose') }} diff --git a/openstack/python-monascaclient/python-monascaclient.spec.j2 b/openstack/python-monascaclient/python-monascaclient.spec.j2 index 1d9a072cc..720a14daf 100644 --- a/openstack/python-monascaclient/python-monascaclient.spec.j2 +++ b/openstack/python-monascaclient/python-monascaclient.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/{{ pypi_name }} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('PrettyTable', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('PyYAML', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} diff --git a/openstack/python-muranoclient/python-muranoclient.spec.j2 b/openstack/python-muranoclient/python-muranoclient.spec.j2 index 9afc349f7..35c38f82d 100644 --- a/openstack/python-muranoclient/python-muranoclient.spec.j2 +++ b/openstack/python-muranoclient/python-muranoclient.spec.j2 @@ -8,7 +8,6 @@ URL: https://launchpad.net/%{name} Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('PrettyTable') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('python-glanceclient') }} BuildRequires: {{ py2pkg('python-keystoneclient') }} diff --git a/openstack/python-neutronclient/python-neutronclient.spec.j2 b/openstack/python-neutronclient/python-neutronclient.spec.j2 index c4b195b46..21fb428ed 100644 --- a/openstack/python-neutronclient/python-neutronclient.spec.j2 +++ b/openstack/python-neutronclient/python-neutronclient.spec.j2 @@ -14,7 +14,6 @@ Source0: {{ source }} # https://review.openstack.org/585387 # Needed for osprofiler==2.3.0 BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('cliff', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('keystoneauth1', py_versions=['py2', 'py3']) }}