openstack
/
rpm-packaging
Code Issues Proposed changes

Merge "Use setuptools instead of distribute (which is part of devel)"

This commit is contained in:
Zuul 2019-03-19 09:28:56 +00:00 committed by Gerrit Code Review
parent faa474d99a 615f5a90a0
commit bf93ed50b9
10 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2
View File

@ -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') }}

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

@ -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('Sphinx', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('contextlib2', py_versions=['py2']) }}

1
openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2
View File

@ -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') }}

1
openstack/ironic-lib/ironic-lib.spec.j2
View File

@ -7,7 +7,6 @@ Group: Development/Languages/Python
URL: https://docs.openstack.org/developer/ironic-lib/
Source0: https://files.pythonhosted.org/packages/source/i/ironic-lib/ironic-lib-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('pbr') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('eventlet') }}

1
openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2
View File

@ -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') }}

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

@ -29,7 +29,6 @@ BuildRequires: {{ py2pkg('abclient') }}
BuildRequires: {{ py2pkg('bcrypt') }}
BuildRequires: {{ py2pkg('python-cinderclient') }}
BuildRequires: {{ py2pkg('croniter') }}
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('eventlet') }}
BuildRequires: {{ py2pkg('fixtures') }}
BuildRequires: {{ py2pkg('freezegun') }}
@ -60,6 +59,7 @@ BuildRequires: {{ py2pkg('oslo.service') }}
BuildRequires: {{ py2pkg('oslo.versionedobjects') }}
BuildRequires: {{ py2pkg('reno') }}
BuildRequires: {{ py2pkg('requests') }}
BuildRequires: {{ py2pkg('setuptools') }}
BuildRequires: {{ py2pkg('six') }}
BuildRequires: {{ py2pkg('sqlalchemy-migrate') }}
BuildRequires: {{ py2pkg('stevedore') }}

1
openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2
View File

@ -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') }}

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

@ -23,7 +23,6 @@ BuildRequires: {{ py2pkg('Flask', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('Flask-RESTful', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('WebTest', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('bcrypt', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('devel', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('fixtures', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('freezegun', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('jsonschema', py_versions=['py3']) }}
@ -44,6 +43,7 @@ BuildRequires: {{ py2pkg('pbr', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('pysaml2', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('requests', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('scrypt', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('setuptools', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('sqlparse', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('stestr', py_versions=['py3']) }}
BuildRequires: {{ py2pkg('testresources', py_versions=['py3']) }}

1
openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2
View File

@ -17,7 +17,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{{ pypi_name }}
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('pbr') }}
BuildRequires: {{ py2pkg('reno') }}
BuildRequires: {{ py2pkg('setuptools') }}

1
openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2
View File

@ -16,7 +16,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') }}