CentOS 8: python-keystoneauth1 should use python3
Change python to python3 get spec files from upstream to support python3 Change-Id: Icf9991b1d0d79d928b5e991ab36f16f878ec3996 Story: 2006729 Task: 38652 Signed-off-by: Yong Fu <fuyong@neusoft.com>
This commit is contained in:
parent
2201c17252
commit
a8d86585e3
|
@ -8,6 +8,7 @@
|
||||||
%global pyver_sitelib %python%{pyver}_sitelib
|
%global pyver_sitelib %python%{pyver}_sitelib
|
||||||
%global pyver_install %py%{pyver}_install
|
%global pyver_install %py%{pyver}_install
|
||||||
%global pyver_build %py%{pyver}_build
|
%global pyver_build %py%{pyver}_build
|
||||||
|
%global pyver_build_wheel %{expand:%{py%{pyver}_build_wheel}}
|
||||||
# End of macros for py2/py3 compatibility
|
# End of macros for py2/py3 compatibility
|
||||||
%global pypi_name keystoneauth1
|
%global pypi_name keystoneauth1
|
||||||
|
|
||||||
|
@ -44,10 +45,11 @@ BuildRequires: python%{pyver}-devel
|
||||||
BuildRequires: python%{pyver}-setuptools
|
BuildRequires: python%{pyver}-setuptools
|
||||||
BuildRequires: python%{pyver}-six
|
BuildRequires: python%{pyver}-six
|
||||||
BuildRequires: python%{pyver}-pbr >= 2.0.0
|
BuildRequires: python%{pyver}-pbr >= 2.0.0
|
||||||
|
BuildRequires: python%{pyver}-wheel
|
||||||
|
|
||||||
# test requires
|
# test requires
|
||||||
#BuildRequires: python%{pyver}-betamax >= 0.7.0
|
BuildRequires: python%{pyver}-betamax >= 0.7.0
|
||||||
BuildRequires: python-betamax >= 0.7.0
|
#BuildRequires: python-betamax >= 0.7.0
|
||||||
BuildRequires: python%{pyver}-fixtures >= 1.3.1
|
BuildRequires: python%{pyver}-fixtures >= 1.3.1
|
||||||
BuildRequires: python%{pyver}-mock
|
BuildRequires: python%{pyver}-mock
|
||||||
BuildRequires: python%{pyver}-oslotest
|
BuildRequires: python%{pyver}-oslotest
|
||||||
|
@ -71,7 +73,6 @@ BuildRequires: python-pep8
|
||||||
BuildRequires: python%{pyver}-PyYAML
|
BuildRequires: python%{pyver}-PyYAML
|
||||||
BuildRequires: python%{pyver}-lxml
|
BuildRequires: python%{pyver}-lxml
|
||||||
BuildRequires: python%{pyver}-requests-kerberos
|
BuildRequires: python%{pyver}-requests-kerberos
|
||||||
BuildRequires: python%{pyver}-pep8
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: python%{pyver}-iso8601 >= 0.1.11
|
Requires: python%{pyver}-iso8601 >= 0.1.11
|
||||||
|
@ -107,9 +108,12 @@ sed -i '/sphinx.ext.intersphinx.*$/d' doc/source/conf.py
|
||||||
rm -rf {test-,}requirements.txt
|
rm -rf {test-,}requirements.txt
|
||||||
# Remove bundled egg-info
|
# Remove bundled egg-info
|
||||||
rm -rf %{pypi_name}.egg-info
|
rm -rf %{pypi_name}.egg-info
|
||||||
|
# remove syntax tests
|
||||||
|
rm keystoneauth1/tests/unit/test_hacking_checks.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{pyver_build}
|
%{pyver_build}
|
||||||
|
%{pyver_build_wheel}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{pyver_install}
|
%{pyver_install}
|
||||||
|
@ -123,6 +127,9 @@ sphinx-build-%{pyver} -b html -d doc/build/doctrees doc/source doc/build/html
|
||||||
rm -rf doc/build/html/.buildinfo
|
rm -rf doc/build/html/.buildinfo
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||||
|
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||||
|
|
||||||
%check
|
%check
|
||||||
PYTHON=python%{pyver} stestr-%{pyver} run
|
PYTHON=python%{pyver} stestr-%{pyver} run
|
||||||
|
|
||||||
|
@ -138,6 +145,15 @@ PYTHON=python%{pyver} stestr-%{pyver} run
|
||||||
%doc doc/build/html
|
%doc doc/build/html
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%package wheels
|
||||||
|
Summary: %{name} wheels
|
||||||
|
|
||||||
|
%description wheels
|
||||||
|
Contains python wheels for %{name}
|
||||||
|
|
||||||
|
%files wheels
|
||||||
|
/wheels/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Oct 03 2019 Joel Capitao <jcapitao@redhat.com> 3.17.1-2
|
* Thu Oct 03 2019 Joel Capitao <jcapitao@redhat.com> 3.17.1-2
|
||||||
- Removed python2 subpackages in no el7 distros
|
- Removed python2 subpackages in no el7 distros
|
||||||
|
|
Loading…
Reference in New Issue