diff --git a/.gitignore b/.gitignore index 46be84c..5fb349f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /python-vitrageclient-2.1.0.tar.gz /python-vitrageclient-2.7.0.tar.gz /python-vitrageclient-3.0.0.tar.gz +/python-vitrageclient-4.0.1.tar.gz diff --git a/python-vitrageclient.spec b/python-vitrageclient.spec index 159e664..37348bb 100644 --- a/python-vitrageclient.spec +++ b/python-vitrageclient.spec @@ -1,14 +1,3 @@ -# Macros for py2/py3 compatibility -%if 0%{?fedora} || 0%{?rhel} > 7 -%global pyver %{python3_pkgversion} -%else -%global pyver 2 -%endif -%global pyver_bin python%{pyver} -%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}} -%global pyver_install %{expand:%{py%{pyver}_install}} -%global pyver_build %{expand:%{py%{pyver}_build}} -# End of macros for py2/py3 compatibility %global pypi_name vitrageclient %{!?upstream_version: %global upstream_version %{version}%{?milestone}} @@ -20,8 +9,8 @@ Python client for Vitrage REST API. Includes python library for Vitrage API \ and Command Line Interface (CLI) library. Name: python-%{pypi_name} -Version: 3.0.0 -Release: 3%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: Python client for Vitrage REST API License: ASL 2.0 @@ -33,54 +22,43 @@ BuildArch: noarch %description %{common_desc} -%package -n python%{pyver}-%{pypi_name} +%package -n python3-%{pypi_name} -BuildRequires: python%{pyver}-devel -BuildRequires: python%{pyver}-setuptools -BuildRequires: python%{pyver}-pbr +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-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 +BuildRequires: python3-iso8601 +BuildRequires: python3-mock +BuildRequires: python3-subunit +BuildRequires: python3-pydot +BuildRequires: python3-oslotest +BuildRequires: python3-testrepository +BuildRequires: python3-testtools +BuildRequires: python3-cliff +BuildRequires: python3-testscenarios + +BuildRequires: python3-networkx + +Requires: python3-iso8601 +Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-pbr +Requires: python3-pydot +Requires: python3-osc-lib >= 1.10.0 +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-oslo-log +Requires: python3-cliff >= 2.8.0 Requires: %{name}-bash-completion = %{version}-%{release} -%if %{pyver} == 2 -Requires: python-networkx -%else -Requires: python%{pyver}-networkx -%endif +Requires: python3-networkx Summary: Python client for Vitrage REST API -%{?python_provide:%python_provide python%{pyver}-%{pypi_name}} -%if %{pyver} == 3 +%{?python_provide:%python_provide python3-%{pypi_name}} Obsoletes: python2-%{pypi_name} < %{version}-%{release} -%endif -%description -n python%{pyver}-%{pypi_name} +%description -n python3-%{pypi_name} %{common_desc} %if 0%{?with_doc} @@ -88,8 +66,8 @@ Obsoletes: python2-%{pypi_name} < %{version}-%{release} %package -n python-%{pypi_name}-doc Summary: Documentation for python client for Vitrage REST API -BuildRequires: python%{pyver}-sphinx -BuildRequires: python%{pyver}-openstackdocstheme +BuildRequires: python3-sphinx +BuildRequires: python3-openstackdocstheme %description -n python-%{pypi_name}-doc Documentation for python client for Vitrage REST API. Includes python library @@ -112,20 +90,20 @@ rm -rf *requirements.txt %build -%{pyver_build} +%{py3_build} %if 0%{?with_doc} # generate html docs -%{pyver_bin} setup.py build_sphinx -b html -# remove the sphinx-build-%{pyver} leftovers +sphinx-build -W -b html doc/source doc/build/html +# remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif %install -%{pyver_install} +%{py3_install} # Create a versioned binary for backwards compatibility until everything is pure py3 -ln -s vitrage %{buildroot}%{_bindir}/vitrage-%{pyver} +ln -s vitrage %{buildroot}%{_bindir}/vitrage-3 # push autocompletion bashcompdir=$(pkg-config --variable=completionsdir bash-completion) @@ -133,17 +111,18 @@ mkdir -p %{buildroot}$bashcompdir 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||: +export PYTHON=%{__python3} +# tests.cli.test_topology_show.TopologyShowTest.test_dot_emitter unit test fail because of +# elements order in a list. Until we find proper fix let's ignore results. +%{__python3} setup.py test --slowest || true -%files -n python%{pyver}-%{pypi_name} +%files -n python3-%{pypi_name} %license LICENSE %doc README.rst -%{pyver_sitelib}/%{pypi_name} -%{pyver_sitelib}/python_%{pypi_name}-*-py?.?.egg-info +%{python3_sitelib}/%{pypi_name} +%{python3_sitelib}/python_%{pypi_name}-*-py?.?.egg-info %{_bindir}/vitrage -%{_bindir}/vitrage-%{pyver} +%{_bindir}/vitrage-3 %if 0%{?with_doc} %files -n python-%{pypi_name}-doc @@ -156,6 +135,9 @@ export PYTHON=%{pyver_bin} %{_datadir}/bash-completion/completions/vitrage %changelog +* Thu Jun 04 2020 Joel Capitao 4.0.1-1 +- Update to upstream version 4.0.1 + * Tue May 26 2020 Miro Hrončok - 3.0.0-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 9f33967..8b3eea9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-vitrageclient-3.0.0.tar.gz) = d812c9d2201cb95d1a46258e6952a1f795abf8f2657319af5660d9b172afb35f6ab6a1793591369e778579d854f67e03287b79d8f75e172872cc47049905c60b +SHA512 (python-vitrageclient-4.0.1.tar.gz) = 607d669a4ccddc0eb938c26cc4f2b2cdaac8976a7c2b774b8ce49df6bd2e5fbe4ecf210eef008d49e3d1689a686bc6e0820c3b0a11f353a2711b9b2cc743c9e1