From 615f5a90a00d7805e788893d7d9fc859288b45c3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 10 Mar 2019 18:59:24 +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: I8df42c896fa76cdabd12578cb0f6b6637d609465 --- openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 | 1 - openstack/futurist/futurist.spec.j2 | 1 - openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 | 1 - openstack/ironic-lib/ironic-lib.spec.j2 | 1 - openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 | 1 - openstack/karbor/karbor.spec.j2 | 2 +- .../keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 | 1 - openstack/keystone/keystone.spec.j2 | 2 +- openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 | 1 - openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 | 1 - 10 files changed, 2 insertions(+), 10 deletions(-) diff --git a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 b/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 index 7a9fa2641..97f5abb7f 100644 --- a/openstack/freezer-tempest-plugin/freezer-tempest-plugin.spec.j2 +++ b/openstack/freezer-tempest-plugin/freezer-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/futurist/futurist.spec.j2 b/openstack/futurist/futurist.spec.j2 index 6b069a4f5..f20394bef 100644 --- a/openstack/futurist/futurist.spec.j2 +++ b/openstack/futurist/futurist.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('Sphinx', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('contextlib2', py_versions=['py2']) }} diff --git a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 b/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 index a98798979..33d5aedb9 100644 --- a/openstack/heat-tempest-plugin/heat-tempest-plugin.spec.j2 +++ b/openstack/heat-tempest-plugin/heat-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/ironic-lib/ironic-lib.spec.j2 b/openstack/ironic-lib/ironic-lib.spec.j2 index 286749183..43a061d43 100644 --- a/openstack/ironic-lib/ironic-lib.spec.j2 +++ b/openstack/ironic-lib/ironic-lib.spec.j2 @@ -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') }} diff --git a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 b/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 index 1d2d42a5e..b07819855 100644 --- a/openstack/ironic-tempest-plugin/ironic-tempest-plugin.spec.j2 +++ b/openstack/ironic-tempest-plugin/ironic-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/karbor/karbor.spec.j2 b/openstack/karbor/karbor.spec.j2 index fb8564f24..b706c3b09 100644 --- a/openstack/karbor/karbor.spec.j2 +++ b/openstack/karbor/karbor.spec.j2 @@ -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') }} diff --git a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 b/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 index 219bb4f8c..0f5e7cfc9 100644 --- a/openstack/keystone-tempest-plugin/keystone-tempest-plugin.spec.j2 +++ b/openstack/keystone-tempest-plugin/keystone-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/keystone/keystone.spec.j2 b/openstack/keystone/keystone.spec.j2 index 0e54e833d..19593cf01 100644 --- a/openstack/keystone/keystone.spec.j2 +++ b/openstack/keystone/keystone.spec.j2 @@ -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']) }} diff --git a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 index 14d51fef0..08424f399 100644 --- a/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 +++ b/openstack/kuryr-tempest-plugin/kuryr-tempest-plugin.spec.j2 @@ -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') }} diff --git a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 index dbea614f6..41953f99a 100644 --- a/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 +++ b/openstack/magnum-tempest-plugin/magnum-tempest-plugin.spec.j2 @@ -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') }}