From a7eb79da196535bc95ed1d996b14cebf84ba2082 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Nov 06 2019 14:19:39 +0000 Subject: Sync from RDO train release --- diff --git a/.gitignore b/.gitignore index a3794ed..a0f9458 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /oslo.log-3.30.0.tar.gz /oslo.log-3.36.0.tar.gz /oslo.log-3.42.3.tar.gz +/oslo.log-3.44.1.tar.gz diff --git a/python-oslo-log.spec b/python-oslo-log.spec index b68a0e0..fb1913a 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -1,8 +1,21 @@ +# 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 %python%{pyver}_sitelib +%global pyver_install %py%{pyver}_install +%global pyver_build %py%{pyver}_build +# End of macros for py2/py3 compatibility %{!?upstream_version: %global upstream_version %{version}%{?milestone}} + %global with_doc 1 %global pypi_name oslo.log %global pkg_name oslo-log + %global common_desc \ OpenStack logging configuration library provides standardized configuration \ for all openstack projects. It also provides custom formatters, handlers and \ @@ -12,8 +25,8 @@ support for context specific logging (like resource id’s etc). Tests for the Oslo Log handling library. Name: python-oslo-log -Version: 3.42.3 -Release: 4%{?dist} +Version: 3.44.1 +Release: 2%{?dist} Summary: OpenStack Oslo Log library License: ASL 2.0 @@ -21,69 +34,86 @@ URL: http://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch +%package -n python%{pyver}-%{pkg_name} +Summary: OpenStack Oslo Log library +%{?python_provide:%python_provide python%{pyver}-%{pkg_name}} +%if %{pyver} == 3 +Obsoletes: python2-%{pkg_name} < %{version}-%{release} +%endif + +BuildRequires: python%{pyver}-devel +BuildRequires: python%{pyver}-pbr +BuildRequires: git +# Required for tests +BuildRequires: python%{pyver}-dateutil +BuildRequires: python%{pyver}-mock +BuildRequires: python%{pyver}-oslotest +BuildRequires: python%{pyver}-oslo-context +BuildRequires: python%{pyver}-oslo-config +BuildRequires: python%{pyver}-oslo-serialization +BuildRequires: python%{pyver}-subunit +BuildRequires: python%{pyver}-testtools +BuildRequires: python%{pyver}-testrepository +BuildRequires: python%{pyver}-testscenarios +# Required to compile translation files +BuildRequires: python%{pyver}-babel +# Handle python2 exception +%if %{pyver} == 2 +BuildRequires: python-inotify +%else +BuildRequires: python%{pyver}-inotify +%endif + +Requires: python%{pyver}-pbr +Requires: python%{pyver}-dateutil +Requires: python%{pyver}-six >= 1.11.0 +Requires: python%{pyver}-oslo-config >= 2:5.2.0 +Requires: python%{pyver}-oslo-context >= 2.20.0 +Requires: python%{pyver}-oslo-i18n >= 3.20.0 +Requires: python%{pyver}-oslo-utils >= 3.36.0 +Requires: python%{pyver}-oslo-serialization >= 2.25.0 +Requires: python%{pyver}-debtcollector >= 1.19.0 +# Handle python2 exception +%if %{pyver} == 2 +Requires: python-inotify +Requires: python%{pyver}-monotonic >= 1.4 +%else +Requires: python%{pyver}-inotify +%endif + +Requires: python-%{pkg_name}-lang = %{version}-%{release} + +%description -n python%{pyver}-%{pkg_name} +%{common_desc} + %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: python%{pyver}-sphinx +BuildRequires: python%{pyver}-openstackdocstheme +BuildRequires: python%{pyver}-oslo-config +BuildRequires: python%{pyver}-oslo-utils %description -n python-%{pkg_name}-doc Documentation for the Oslo Log handling library. %endif -%package -n python3-%{pkg_name}-tests +%package -n python%{pyver}-%{pkg_name}-tests 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.2.0 -Requires: python3-subunit -Requires: python3-testrepository -Requires: python3-testscenarios -Requires: python3-testtools +Requires: python%{pyver}-%{pkg_name} = %{version}-%{release} +Requires: python%{pyver}-mock +Requires: python%{pyver}-oslotest +Requires: python%{pyver}-oslo-config >= 2:5.2.0 +Requires: python%{pyver}-subunit +Requires: python%{pyver}-testtools +Requires: python%{pyver}-testrepository +Requires: python%{pyver}-testscenarios -%description -n python3-%{pkg_name}-tests +%description -n python%{pyver}-%{pkg_name}-tests %{common_desc1} -%package -n python3-%{pkg_name} -Summary: OpenStack Oslo Log library -%{?python_provide:%python_provide python3-%{pkg_name}} - -BuildRequires: python3-devel -BuildRequires: python3-pbr -# Required for tests -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 -BuildRequires: python3-testscenarios -BuildRequires: python3-testtools -BuildRequires: python3-inotify - -Requires: python3-pbr -Requires: python3-dateutil -Requires: python3-monotonic -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} - -%description -n python3-%{pkg_name} -Oslo concurrency library has utilities for safely running multi-thread, -multi-process applications using locking mechanisms and for running -external processes. - %description %{common_desc} @@ -99,36 +129,41 @@ Translation files for Oslo log library rm -rf {test-,}requirements.txt %build -%py3_build +%{pyver_build} %if 0%{?with_doc} # generate html docs -PYTHONPATH=. sphinx-build-3 -W -b html doc/source doc/build/html -# remove the sphinx-build-3 leftovers +PYTHONPATH=. sphinx-build-%{pyver} -W -b html doc/source doc/build/html +# remove the sphinx-build-%{pyver} leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif # Generate i18n files -%{__python3} setup.py compile_catalog -d build/lib/oslo_log/locale +%{pyver_bin} setup.py compile_catalog -d build/lib/oslo_log/locale %install -%py3_install -ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-3 -ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-%{python3_version} - +%{pyver_install} +ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-%{pyver} # 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 -rm -f %{buildroot}%{python3_sitelib}/oslo_log/locale/*pot -mv %{buildroot}%{python3_sitelib}/oslo_log/locale %{buildroot}%{_datadir}/locale +rm -f %{buildroot}%{pyver_sitelib}/oslo_log/locale/*/LC_*/oslo_log*po +rm -f %{buildroot}%{pyver_sitelib}/oslo_log/locale/*pot +mv %{buildroot}%{pyver_sitelib}/oslo_log/locale %{buildroot}%{_datadir}/locale # Find language files %find_lang oslo_log --all-name %check -rm -rf .testrepository -# Ignore unit tests until https://bugs.launchpad.net/oslo.log/+bug/1783630 is fixed -%{__python3} setup.py test||: +%{pyver_bin} setup.py test + +%files -n python%{pyver}-%{pkg_name} +%doc README.rst ChangeLog AUTHORS +%license LICENSE +%{pyver_sitelib}/oslo_log +%{pyver_sitelib}/*.egg-info +%{_bindir}/convert-json +%{_bindir}/convert-json-%{pyver} +%exclude %{pyver_sitelib}/oslo_log/tests %if 0%{?with_doc} %files -n python-%{pkg_name}-doc @@ -136,24 +171,16 @@ rm -rf .testrepository %license LICENSE %endif -%files -n python-%{pkg_name}-lang -f oslo_log.lang -%license LICENSE +%files -n python%{pyver}-%{pkg_name}-tests +%{pyver_sitelib}/oslo_log/tests -%files -n python3-%{pkg_name} -%doc README.rst ChangeLog AUTHORS +%files -n python-%{pkg_name}-lang -f oslo_log.lang %license LICENSE -%{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 -%{python3_sitelib}/oslo_log/tests - %changelog +* Wed Nov 06 2019 Alfredo Moralejo 3.44.1-2 +- Update to upstream version 3.44.1 + * Thu Oct 03 2019 Miro Hrončok - 3.42.3-4 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 8b1b5ca..89c6269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.log-3.42.3.tar.gz) = ac9425725c86b73cd87c2e61d2254a7c4267bafdff1fd27ad88a177d5fc4f6c8a9a10d6fb38425a0b40d9095e5139de028a4c775f02de226a85a91d46dc195f4 +SHA512 (oslo.log-3.44.1.tar.gz) = b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca