From 0fe35ada5c5704090ce0977eabfe994a2664701f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 10 Mar 2019 18:59:41 +0100 Subject: [PATCH] Use setuptools instead of distribute (which is part of devel) 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: I529abd5c76731023c8c2eccc7a42984a521bf607 --- openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 | 1 - openstack/microversion_parse/microversion_parse.spec.j2 | 1 - openstack/mistral/mistral.spec.j2 | 1 - openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 | 1 - openstack/neutron-lib/neutron-lib.spec.j2 | 1 - openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 | 1 - openstack/nova/nova.spec.j2 | 1 - openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 | 1 - openstack/openstack-doc-tools/openstack-doc-tools.spec.j2 | 1 - openstack/openstackdocstheme/openstackdocstheme.spec.j2 | 1 - openstack/os-apply-config/os-apply-config.spec.j2 | 1 - openstack/os-brick/os-brick.spec.j2 | 2 +- 12 files changed, 1 insertion(+), 12 deletions(-) diff --git a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 b/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 index 738e9e42e..83f4c8277 100644 --- a/openstack/manila-tempest-plugin/manila-tempest-plugin.spec.j2 +++ b/openstack/manila-tempest-plugin/manila-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/microversion_parse/microversion_parse.spec.j2 b/openstack/microversion_parse/microversion_parse.spec.j2 index 74674c0ee..6124d9da5 100644 --- a/openstack/microversion_parse/microversion_parse.spec.j2 +++ b/openstack/microversion_parse/microversion_parse.spec.j2 @@ -8,7 +8,6 @@ URL: http://www.openstack.org/ Source0: https://files.pythonhosted.org/packages/source/m/microversion_parse/microversion_parse-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: {{ py2pkg('WebOb') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('gabbi') }} BuildRequires: {{ py2pkg('setuptools') }} BuildRequires: {{ py2pkg('stestr') }} diff --git a/openstack/mistral/mistral.spec.j2 b/openstack/mistral/mistral.spec.j2 index d56124d3f..2cbc22ff2 100644 --- a/openstack/mistral/mistral.spec.j2 +++ b/openstack/mistral/mistral.spec.j2 @@ -23,7 +23,6 @@ BuildRequires: {{ py2pkg('python-barbicanclient') }} BuildRequires: {{ py2pkg('python-cinderclient') }} BuildRequires: {{ py2pkg('croniter') }} BuildRequires: {{ py2pkg('python-designateclient') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('python-glanceclient') }} BuildRequires: {{ py2pkg('python-glareclient') }} diff --git a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 b/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 index b08bc241a..b4e25e5c0 100644 --- a/openstack/monasca-tempest-plugin/monasca-tempest-plugin.spec.j2 +++ b/openstack/monasca-tempest-plugin/monasca-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/neutron-lib/neutron-lib.spec.j2 b/openstack/neutron-lib/neutron-lib.spec.j2 index ca3139b47..e646616bd 100644 --- a/openstack/neutron-lib/neutron-lib.spec.j2 +++ b/openstack/neutron-lib/neutron-lib.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://docs.openstack.org/developer/neutron-lib/ Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('SQLAlchemy', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('WebOb', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('debtcollector', py_versions=['py2', 'py3']) }} diff --git a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 b/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 index ac5558162..b3e65b83a 100644 --- a/openstack/neutron-tempest-plugin/neutron-tempest-plugin.spec.j2 +++ b/openstack/neutron-tempest-plugin/neutron-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/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2 index 3e3119c53..e62e06a6a 100644 --- a/openstack/nova/nova.spec.j2 +++ b/openstack/nova/nova.spec.j2 @@ -42,7 +42,6 @@ BuildRequires: {{ py2pkg('python-barbicanclient') }} BuildRequires: {{ py2pkg('python-cinderclient') }} BuildRequires: {{ py2pkg('cursive') }} BuildRequires: {{ py2pkg('ddt') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('fixtures') }} BuildRequires: {{ py2pkg('python-glanceclient') }} BuildRequires: {{ py2pkg('python-ironicclient') }} diff --git a/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 b/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 index d8aae25a4..1f3c6de93 100644 --- a/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 +++ b/openstack/octavia-tempest-plugin/octavia-tempest-plugin.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/{{ pypi_name }} Source0: {{ source|basename }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('Tempest') }} Requires: {{ py2pkg('cryptography') }} diff --git a/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2 b/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2 index 2bccfdafd..3a83f21b8 100644 --- a/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2 +++ b/openstack/openstack-doc-tools/openstack-doc-tools.spec.j2 @@ -13,7 +13,6 @@ BuildRequires: {{ py2pkg('Babel') }} BuildRequires: {{ py2pkg('PyYAML') }} BuildRequires: {{ py2pkg('Sphinx') }} BuildRequires: {{ py2pkg('demjson') }} -BuildRequires: {{ py2pkg('devel') }} BuildRequires: {{ py2pkg('lxml') }} BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('openstackdocstheme') }} diff --git a/openstack/openstackdocstheme/openstackdocstheme.spec.j2 b/openstack/openstackdocstheme/openstackdocstheme.spec.j2 index 7de8397d3..5220adcf3 100644 --- a/openstack/openstackdocstheme/openstackdocstheme.spec.j2 +++ b/openstack/openstackdocstheme/openstackdocstheme.spec.j2 @@ -12,7 +12,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/%{sname} Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('devel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('Sphinx', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('dulwich', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} diff --git a/openstack/os-apply-config/os-apply-config.spec.j2 b/openstack/os-apply-config/os-apply-config.spec.j2 index ea774931e..8389d4ca5 100644 --- a/openstack/os-apply-config/os-apply-config.spec.j2 +++ b/openstack/os-apply-config/os-apply-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') }} BuildRequires: {{ py2pkg('pbr') }} BuildRequires: {{ py2pkg('setuptools') }} Requires: {{ py2pkg('PyYAML') }} diff --git a/openstack/os-brick/os-brick.spec.j2 b/openstack/os-brick/os-brick.spec.j2 index b0e183cec..2f2929f12 100644 --- a/openstack/os-brick/os-brick.spec.j2 +++ b/openstack/os-brick/os-brick.spec.j2 @@ -13,7 +13,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('Babel', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('castellan', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('ddt', py_versions=['py2', 'py3']) }} @@ -32,6 +31,7 @@ BuildRequires: {{ py2pkg('python-subunit', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('reno', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('requests', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('retrying', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('six', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }}