From cd15180da5c7c0e2557f78600494f7d2f17d4cf1 Mon Sep 17 00:00:00 2001 From: melissaml Date: Tue, 5 Jun 2018 09:46:37 +0800 Subject: [PATCH] Update python-magnumclient to 2.10.0 Change-Id: I5fe08eeb18d340627531c3a4dcb9287b6bfc16a8 --- .../python-magnumclient/python-magnumclient.spec.j2 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openstack/python-magnumclient/python-magnumclient.spec.j2 b/openstack/python-magnumclient/python-magnumclient.spec.j2 index 45fc16726..2bcabf69c 100644 --- a/openstack/python-magnumclient/python-magnumclient.spec.j2 +++ b/openstack/python-magnumclient/python-magnumclient.spec.j2 @@ -1,5 +1,5 @@ {% set pypi_name = 'python-magnumclient' %} -{% set upstream_version = upstream_version('2.9.0') %} +{% set upstream_version = upstream_version('2.10.0') %} {% set rpm_release = '1' %} {% set source = url_pypi() %} @@ -30,7 +30,7 @@ BuildRequires: {{ py2pkg('osprofiler', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('pbr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('python-subunit', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py2pkg('stestr', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testscenarios', py_versions=['py2', 'py3']) }} BuildRequires: {{ py2pkg('testtools', py_versions=['py2', 'py3']) }} Requires: {{ py2pkg('Babel') }} @@ -82,7 +82,8 @@ sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %{python_build} # Build HTML docs and man page -%{__python2} setup.py build_sphinx --builder=html,man +PBR_VERSION={{ upstream_version }} sphinx-build -b html doc/source doc/build/html +PBR_VERSION={{ upstream_version }} sphinx-build -b man doc/source doc/build/man rm -rf html/.{doctrees,buildinfo} %install @@ -102,9 +103,7 @@ install -p -D -m 644 tools/magnum.bash_completion %{buildroot}%{_sysconfdir}/bas %python_uninstall_alternative magnum %check -%{python_expand rm -rf .testrepository -$python setup.py testr -} +%python_exec -m stestr.cli run %files %{python_files} %license LICENSE