openstack/rpm-packaging
Code Issues Proposed changes

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

Browse Source 
By building the package with setuptools, we ensure it is compatible
with pip 10 and above which require file manifests to be packaged.

Change-Id: Id4461b5437f0e8592bc8c3ba9581344477a34876
This commit is contained in:
Dirk Mueller
2019-03-10 18:59:06 +01:00
parent 9dc46b2a88
commit bb2ae52f2a
12 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-mdi/XStatic-mdi.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-mdi/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-roboto-fontface/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
BuildArch: noarch

1
openstack/XStatic-smart-table/XStatic-smart-table.spec.j2
View File

@@ -9,7 +9,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/%{openstack_name}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

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

@@ -9,7 +9,6 @@ URL: https://github.com/openstack/python-aodhclient
Source0: https://files.pythonhosted.org/packages/source/a/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('cliff') }}
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('keystoneauth1') }}
BuildRequires: {{ py2pkg('openstackdocstheme') }}
BuildRequires: {{ py2pkg('oslo.serialization') }}

1
openstack/barbican-tempest-plugin/barbican-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/ceilometermiddleware/ceilometermiddleware.spec.j2
View File

@@ -13,7 +13,6 @@ URL: https://docs.openstack.org/developer/ceilometermiddleware
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('betamax') }}
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('keystoneauth1') }}
BuildRequires: {{ py2pkg('python-keystoneclient') }}
BuildRequires: {{ py2pkg('mock') }}

1
openstack/cinder-tempest-plugin/cinder-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/cliff/cliff.spec.j2
View File

@@ -12,7 +12,6 @@ Group: Development/Languages/Python
URL: https://launchpad.net/python-{{ 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('cmd2', py_versions=['py2']) }}

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

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://docs.openstack.org/developer/debtcollector/
Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('fixtures', py_versions=['py2', 'py3']) }}
BuildRequires: {{ py2pkg('funcsigs', py_versions=['py2']) }}
BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}

1
openstack/designate-tempest-plugin/designate-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/dib-utils/dib-utils.spec.j2
View File

@@ -9,7 +9,6 @@ URL: https://launchpad.net/%{sname}
Source0: https://tarballs.openstack.org//%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('d2to1') }}
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('pbr') }}
BuildArch: noarch