diff --git a/.gitignore b/.gitignore index e910a81..a3794ed 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /oslo.log-3.20.1.tar.gz /oslo.log-3.30.0.tar.gz /oslo.log-3.36.0.tar.gz +/oslo.log-3.42.3.tar.gz diff --git a/python-oslo-log.spec b/python-oslo-log.spec index 008bcd1..81eb15a 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -1,3 +1,4 @@ + %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 %global pypi_name oslo.log @@ -11,8 +12,8 @@ support for context specific logging (like resource id’s etc). Tests for the Oslo Log handling library. Name: python-oslo-log -Version: 3.36.0 -Release: 2%{?dist} +Version: 3.42.3 +Release: 1%{?dist} Summary: OpenStack Oslo Log library License: ASL 2.0 @@ -20,17 +21,12 @@ URL: http://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch -BuildRequires: git - %if 0%{?with_doc} %package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo Log handling library BuildRequires: python3-sphinx BuildRequires: python3-openstackdocstheme -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-context -BuildRequires: python3-oslo-utils %description -n python-%{pkg_name}-doc Documentation for the Oslo Log handling library. @@ -42,7 +38,7 @@ Summary: Tests for the Oslo Log handling library Requires: python3-%{pkg_name} = %{version}-%{release} Requires: python3-mock Requires: python3-oslotest -Requires: python3-oslo-config >= 2:5.1.0 +Requires: python3-oslo-config >= 2:5.2.0 Requires: python3-subunit Requires: python3-testrepository Requires: python3-testscenarios @@ -54,7 +50,6 @@ Requires: python3-testtools %package -n python3-%{pkg_name} Summary: OpenStack Oslo Log library %{?python_provide:%python_provide python3-%{pkg_name}} -Obsoletes: python2-%{pkg_name} < %{version}-%{release} BuildRequires: python3-devel BuildRequires: python3-pbr @@ -63,6 +58,7 @@ BuildRequires: python3-dateutil BuildRequires: python3-mock BuildRequires: python3-oslotest BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-context BuildRequires: python3-oslo-serialization BuildRequires: python3-subunit BuildRequires: python3-testrepository @@ -73,12 +69,12 @@ BuildRequires: python3-inotify Requires: python3-pbr Requires: python3-dateutil Requires: python3-monotonic -Requires: python3-six >= 1.10.0 -Requires: python3-oslo-config >= 2:5.1.0 -Requires: python3-oslo-context >= 2.19.2 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-oslo-serialization >= 2.18.0 +Requires: python3-six >= 1.11.0 +Requires: python3-oslo-config >= 2:5.2.0 +Requires: python3-oslo-context >= 2.20.0 +Requires: python3-oslo-i18n >= 3.20.0 +Requires: python3-oslo-utils >= 3.36.0 +Requires: python3-oslo-serialization >= 2.25.0 Requires: python3-debtcollector Requires: python3-inotify Requires: python-%{pkg_name}-lang = %{version}-%{release} @@ -107,8 +103,8 @@ rm -rf {test-,}requirements.txt %if 0%{?with_doc} # generate html docs -%{__python3} setup.py build_sphinx -b html -# remove the sphinx-build leftovers +PYTHONPATH=. sphinx-build-3 -W -b html doc/source doc/build/html +# remove the sphinx-build-3 leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif # Generate i18n files @@ -116,6 +112,10 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %install %py3_install +ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-3 +ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-%{python3_version} + + # Install i18n .mo files (.po and .pot are not required) install -d -m 755 %{buildroot}%{_datadir} rm -f %{buildroot}%{python3_sitelib}/oslo_log/locale/*/LC_*/oslo_log*po @@ -126,11 +126,9 @@ mv %{buildroot}%{python3_sitelib}/oslo_log/locale %{buildroot}%{_datadir}/locale %find_lang oslo_log --all-name %check -export PYTHON=%{__python3} -# Ignore test results, there are issues reported when running with python3, which is fixed -# in later versions of oslo.log, till package is bumped, ignore tests: -# https://github.com/openstack/oslo.log/commit/dbab9ab8c2a0ee08d8259e4934a2799dc07fdbd8 -%{__python3} setup.py test || true +rm -rf .testrepository +# Ignore unit tests until https://bugs.launchpad.net/oslo.log/+bug/1783630 is fixed +%{__python3} setup.py test||: %if 0%{?with_doc} %files -n python-%{pkg_name}-doc @@ -147,6 +145,8 @@ export PYTHON=%{__python3} %{python3_sitelib}/oslo_log %{python3_sitelib}/*.egg-info %{_bindir}/convert-json +%{_bindir}/convert-json-3 +%{_bindir}/convert-json-%{python3_version} %exclude %{python3_sitelib}/oslo_log/tests %files -n python3-%{pkg_name}-tests @@ -154,9 +154,6 @@ export PYTHON=%{__python3} %changelog -* Thu Jan 31 2019 Yatin Karel - 3.36.0-2 -- Drop python2 sub packages (#1627442) - -* Sat Feb 10 2018 RDO 3.36.0-1 -- Update to 3.36.0 +* Fri Mar 08 2019 RDO 3.42.3-1 +- Update to 3.42.3 diff --git a/sources b/sources index 7653d83..8b1b5ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.log-3.36.0.tar.gz) = 47234c4bef09e105709b765fe0d5b297312ac73169a438f2759cbff335f059afdefc323c290a32bb587dbb6d2095de536ae7111a31e6c5b280e760b9b6b971c6 +SHA512 (oslo.log-3.42.3.tar.gz) = ac9425725c86b73cd87c2e61d2254a7c4267bafdff1fd27ad88a177d5fc4f6c8a9a10d6fb38425a0b40d9095e5139de028a4c775f02de226a85a91d46dc195f4