| |
@@ -1,23 +1,27 @@
|
| |
- %global pypi_name vitrageclient
|
| |
- %if 0%{?fedora}
|
| |
+ # Macros for py2/py3 compatibility
|
| |
+ %if 0%{?fedora} || 0%{?rhel} > 7
|
| |
+ %global pyver %{python3_pkgversion}
|
| |
%else
|
| |
- %global with_python3 0
|
| |
- %endif
|
| |
-
|
| |
- %if 0%{?fedora}==0
|
| |
- %global __python2 /usr/bin/python
|
| |
+ %global pyver 2
|
| |
%endif
|
| |
-
|
| |
+ %global pyver_bin python%{pyver}
|
| |
+ %global pyver_sitelib %python%{pyver}_sitelib
|
| |
+ %global pyver_install %py%{pyver}_install
|
| |
+ %global pyver_build %py%{pyver}_build
|
| |
+ # End of macros for py2/py3 compatibility
|
| |
+ %global pypi_name vitrageclient
|
| |
|
| |
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
| |
+ %{!?py_req_cleanup: %global py_req_cleanup rm -rf {,test-}requirements.txt}
|
| |
+ %global with_doc 1
|
| |
|
| |
%global common_desc \
|
| |
Python client for Vitrage REST API. Includes python library for Vitrage API \
|
| |
and Command Line Interface (CLI) library.
|
| |
|
| |
Name: python-%{pypi_name}
|
| |
- Version: 2.1.0
|
| |
- Release: 3%{?dist}
|
| |
+ Version: 2.7.0
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Python client for Vitrage REST API
|
| |
|
| |
License: ASL 2.0
|
| |
@@ -29,46 +33,68 @@
|
| |
%description
|
| |
%{common_desc}
|
| |
|
| |
- %package -n python3-%{pypi_name}
|
| |
- Summary: Python client for Vitrage REST API
|
| |
- %{?python_provide:%python_provide python3-%{pypi_name}}
|
| |
-
|
| |
- BuildRequires: python3-devel
|
| |
- BuildRequires: python3-setuptools
|
| |
- BuildRequires: python3-pbr >= 0.6
|
| |
- BuildRequires: python3-cliff
|
| |
- BuildRequires: python3-iso8601
|
| |
- BuildRequires: python3-mock
|
| |
- BuildRequires: python3-subunit
|
| |
- BuildRequires: python3-oslotest
|
| |
- BuildRequires: python3-testrepository
|
| |
- BuildRequires: python3-testscenarios
|
| |
- BuildRequires: python3-testtools
|
| |
-
|
| |
- Requires: python3-babel >= 2.3.4
|
| |
- Requires: python3-cliff >= 2.8.0
|
| |
- Requires: python3-keystoneauth1 >= 3.3.0
|
| |
- Requires: python3-iso8601
|
| |
- Requires: python3-pbr
|
| |
- Requires: python3-osc-lib >= 1.8.0
|
| |
- Requires: python3-oslo-utils >= 3.33.0
|
| |
- Requires: python3-oslo-log
|
| |
+ %package -n python%{pyver}-%{pypi_name}
|
| |
+
|
| |
+ BuildRequires: python%{pyver}-devel
|
| |
+ BuildRequires: python%{pyver}-setuptools
|
| |
+ BuildRequires: python%{pyver}-pbr
|
| |
+ BuildRequires: git
|
| |
+ BuildRequires: python%{pyver}-iso8601
|
| |
+ BuildRequires: python%{pyver}-mock
|
| |
+ BuildRequires: python%{pyver}-subunit
|
| |
+ BuildRequires: python%{pyver}-pydot
|
| |
+ BuildRequires: python%{pyver}-oslotest
|
| |
+ BuildRequires: python%{pyver}-testrepository
|
| |
+ BuildRequires: python%{pyver}-testtools
|
| |
+ BuildRequires: python%{pyver}-cliff
|
| |
+ BuildRequires: python%{pyver}-testscenarios
|
| |
+
|
| |
+ %if %{pyver} == 2
|
| |
+ BuildRequires: python-networkx
|
| |
+ %else
|
| |
+ BuildRequires: python%{pyver}-networkx
|
| |
+ %endif
|
| |
+
|
| |
+ Requires: python%{pyver}-babel >= 2.3.4
|
| |
+ Requires: python%{pyver}-iso8601
|
| |
+ Requires: python%{pyver}-keystoneauth1 >= 3.4.0
|
| |
+ Requires: python%{pyver}-pbr
|
| |
+ Requires: python%{pyver}-pydot
|
| |
+ Requires: python%{pyver}-osc-lib >= 1.10.0
|
| |
+ Requires: python%{pyver}-oslo-utils >= 3.33.0
|
| |
+ Requires: python%{pyver}-oslo-log
|
| |
+ Requires: python%{pyver}-cliff >= 2.8.0
|
| |
|
| |
Requires: %{name}-bash-completion = %{version}-%{release}
|
| |
|
| |
- %description -n python3-%{pypi_name}
|
| |
+ %if %{pyver} == 2
|
| |
+ Requires: python-networkx
|
| |
+ %else
|
| |
+ Requires: python%{pyver}-networkx
|
| |
+ %endif
|
| |
+
|
| |
+
|
| |
+ Summary: Python client for Vitrage REST API
|
| |
+ %{?python_provide:%python_provide python%{pyver}-%{pypi_name}}
|
| |
+ %if %{pyver} == 3
|
| |
+ Obsoletes: python2-%{pypi_name} < %{version}-%{release}
|
| |
+ %endif
|
| |
+
|
| |
+ %description -n python%{pyver}-%{pypi_name}
|
| |
%{common_desc}
|
| |
|
| |
+ %if 0%{?with_doc}
|
| |
# Documentation package
|
| |
%package -n python-%{pypi_name}-doc
|
| |
Summary: Documentation for python client for Vitrage REST API
|
| |
|
| |
- BuildRequires: python3-sphinx
|
| |
- BuildRequires: python3-openstackdocstheme
|
| |
+ BuildRequires: python%{pyver}-sphinx
|
| |
+ BuildRequires: python%{pyver}-openstackdocstheme
|
| |
|
| |
%description -n python-%{pypi_name}-doc
|
| |
Documentation for python client for Vitrage REST API. Includes python library
|
| |
for Vitrage API and Command Line Interface (CLI) library.
|
| |
+ %endif
|
| |
|
| |
%package bash-completion
|
| |
Summary: bash completion files for vitrage
|
| |
@@ -82,20 +108,24 @@
|
| |
%autosetup -n %{name}-%{upstream_version} -S git
|
| |
|
| |
# Let RPM handle the dependencies
|
| |
- rm -rf {,test-}requirements.txt
|
| |
+ rm -rf *requirements.txt
|
| |
|
| |
|
| |
%build
|
| |
- %py3_build
|
| |
+ %{pyver_build}
|
| |
|
| |
+ %if 0%{?with_doc}
|
| |
# generate html docs
|
| |
- %{__python3} setup.py build_sphinx -b html
|
| |
- # remove the sphinx-build leftovers
|
| |
+ %{pyver_bin} setup.py build_sphinx -b html
|
| |
+ # remove the sphinx-build-%{pyver} leftovers
|
| |
rm -rf doc/build/html/.{doctrees,buildinfo}
|
| |
-
|
| |
+ %endif
|
| |
|
| |
%install
|
| |
- %py3_install
|
| |
+ %{pyver_install}
|
| |
+
|
| |
+ # Create a versioned binary for backwards compatibility until everything is pure py3
|
| |
+ ln -s vitrage %{buildroot}%{_bindir}/vitrage-%{pyver}
|
| |
|
| |
# push autocompletion
|
| |
bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
|
| |
@@ -103,29 +133,35 @@
|
| |
mv %{buildroot}%{_datadir}/vitrage.bash_completion %{buildroot}$bashcompdir/vitrage
|
| |
|
| |
%check
|
| |
+ export PYTHON=%{pyver_bin}
|
| |
+ # one test is failing comparing elements because of order in a list.
|
| |
+ %{pyver_bin} setup.py test --slowest ||:
|
| |
|
| |
- # python3 tests currently fail
|
| |
- ##PYTHON=%{__python3} %{__python3} setup.py test --slowest
|
| |
-
|
| |
- %files -n python3-%{pypi_name}
|
| |
+ %files -n python%{pyver}-%{pypi_name}
|
| |
%license LICENSE
|
| |
%doc README.rst
|
| |
+ %{pyver_sitelib}/%{pypi_name}
|
| |
+ %{pyver_sitelib}/python_%{pypi_name}-*-py?.?.egg-info
|
| |
%{_bindir}/vitrage
|
| |
- %{python3_sitelib}/%{pypi_name}
|
| |
- %{python3_sitelib}/python_%{pypi_name}-*-py?.?.egg-info
|
| |
+ %{_bindir}/vitrage-%{pyver}
|
| |
|
| |
+ %if 0%{?with_doc}
|
| |
%files -n python-%{pypi_name}-doc
|
| |
%doc doc/build/html
|
| |
%license LICENSE
|
| |
+ %endif
|
| |
|
| |
%files bash-completion
|
| |
%license LICENSE
|
| |
%{_datadir}/bash-completion/completions/vitrage
|
| |
|
| |
%changelog
|
| |
+ * Mon Mar 11 2019 RDO <dev@lists.rdoproject.org> 2.7.0-1
|
| |
+ - Update to 2.7.0
|
| |
+
|
| |
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
-
|
| |
+ -
|
| |
* Mon Nov 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.1.0-2
|
| |
- Subpackage python2-vitrageclient has been removed
|
| |
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
|
| |
amoralej
commented 5 years ago
Part of the OpenStack clients update to Stein releases.