openstack/rpm-packaging
Code Issues Proposed changes

cinder-tempest-plugin: Switch to python3

Browse Source 
- Also drop the doc package. There is no doc that could be built.

Change-Id: I9dbeae8c3e39a02c0af1f8ed986e2f1aedb612b1
This commit is contained in:
Thomas Bechtold
2019-09-03 11:18:40 +02:00
parent e5044d96ac
commit dbe8219eb3
1 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
openstack/cinder-tempest-plugin/cinder-tempest-plugin.spec.j2
View File

@@ -3,10 +3,6 @@
{% set upstream_version = upstream_version() %}
{% set rpm_release = '1' %}
%global with_doc 0
%global common_desc \
This package contains Tempest tests to cover the cinder project. \
Additionally it provides a plugin to automatically load these tests into Tempest.
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
@@ -16,60 +12,33 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{{ pypi_name }}
Source0: {{ source|basename }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('pbr') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('Tempest') }}
Requires: {{ py2pkg('oslo.config') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('pbr') }}
Requires: {{ py2pkg('six') }}
Requires: {{ py2pkg('testtools') }}
BuildRequires: {{ py3('pbr') }}
Requires: {{ py2pkg('tempest') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('pbr') }}
Requires: {{ py3('six') }}
Requires: {{ py3('testtools') }}
BuildArch: noarch
%description
%{common_desc}
%if 0%{?with_doc}
%package doc
Summary: Documentation for cinder tempest plugin
BuildRequires: {{ py2pkg('Sphinx') }}
BuildRequires: {{ py2pkg('oslosphinx') }}
%description doc
It contains the documentation for the cinder tempest tests.
%endif
This package contains Tempest tests to cover the cinder project.
Additionally it provides a plugin to automatically load these tests into Tempest.
%prep
%autosetup -n {{ pypi_name }}-{{ upstream_version }}
# Let's handle dependencies ourseleves
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
# Remove bundled egg-info
rm -rf %{module}.egg-info
%build
%{py2_build}
# Generate Docs
%if 0%{?with_doc}
%{__python2} setup.py build_sphinx
# remove the sphinx build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%endif
%{py3_build}
%install
%{py2_install}
%{py3_install}
%files
%license LICENSE
%doc README.rst
%{python2_sitelib}/cinder_tempest_plugin
%{python2_sitelib}/*.egg-info
%if 0%{?with_doc}
%files doc
%doc doc/build/html
%license LICENSE
%endif
%{python3_sitelib}/cinder_tempest_plugin
%{python3_sitelib}/*.egg-info
%changelog