From 338b88b3a051710b3a0c5f9e7cc88971b4a901b4 Mon Sep 17 00:00:00 2001 From: yatin Date: Jan 31 2019 12:56:57 +0000 Subject: Drop python2 sup package (#1627442) --- diff --git a/python-oslo-log.spec b/python-oslo-log.spec index 79ecbdc..008bcd1 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} >= 24 -%global with_python3 1 -%endif - %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 %global pypi_name oslo.log @@ -16,7 +12,7 @@ Tests for the Oslo Log handling library. Name: python-oslo-log Version: 3.36.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenStack Oslo Log library License: ASL 2.0 @@ -24,92 +20,22 @@ URL: http://launchpad.net/oslo Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch -%package -n python2-%{pkg_name} -Summary: OpenStack Oslo Log library -%{?python_provide:%python_provide python2-%{pkg_name}} - -BuildRequires: python2-devel -BuildRequires: python2-pbr BuildRequires: git -# Required for tests -# FIXME(hguemar): required or tests will fail -# should be unnecessary with Rocky version -BuildRequires: python-unversioned-command -BuildRequires: python2-dateutil -BuildRequires: python2-mock -BuildRequires: python2-oslotest -BuildRequires: python2-oslo-context -BuildRequires: python2-oslo-config -BuildRequires: python2-oslo-serialization -BuildRequires: python2-subunit -BuildRequires: python2-testtools -# Required to compile translation files -BuildRequires: python2-babel -%if 0%{?fedora} > 0 -BuildRequires: python2-inotify -BuildRequires: python2-testrepository -BuildRequires: python2-testscenarios -%else -BuildRequires: python-inotify -BuildRequires: python-testrepository -BuildRequires: python-testscenarios -%endif - -Requires: python2-pbr -Requires: python2-dateutil -Requires: python2-six >= 1.10.0 -Requires: python2-oslo-config >= 2:5.1.0 -Requires: python2-oslo-context >= 2.19.2 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-oslo-serialization >= 2.18.0 -Requires: python2-debtcollector >= 1.2.0 -%if 0%{?fedora} > 0 -Requires: python2-inotify -Requires: python2-monotonic -%else -Requires: python-inotify -Requires: python-monotonic -%endif -Requires: python-%{pkg_name}-lang = %{version}-%{release} - -%description -n python2-%{pkg_name} -%{common_desc} %if 0%{?with_doc} %package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo Log handling library -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-oslo-config -BuildRequires: python2-oslo-utils +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. %endif -%package -n python2-%{pkg_name}-tests -Summary: Tests for the Oslo Log handling library - -Requires: python2-%{pkg_name} = %{version}-%{release} -Requires: python2-mock -Requires: python2-oslotest -Requires: python2-oslo-config >= 2:5.1.0 -Requires: python2-subunit -Requires: python2-testtools -%if 0%{?fedora} > 0 -Requires: python2-testrepository -Requires: python2-testscenarios -%else -Requires: python-testrepository -Requires: python-testscenarios -%endif - -%description -n python2-%{pkg_name}-tests -%{common_desc1} - -%if 0%{?with_python3} %package -n python3-%{pkg_name}-tests Summary: Tests for the Oslo Log handling library @@ -124,12 +50,11 @@ Requires: python3-testtools %description -n python3-%{pkg_name}-tests %{common_desc1} -%endif -%if 0%{?with_python3} %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 @@ -162,7 +87,6 @@ Requires: python-%{pkg_name}-lang = %{version}-%{release} Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes. -%endif %description %{common_desc} @@ -179,59 +103,34 @@ Translation files for Oslo log library rm -rf {test-,}requirements.txt %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %if 0%{?with_doc} # generate html docs -%{__python2} setup.py build_sphinx -b html +%{__python3} setup.py build_sphinx -b html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif # Generate i18n files -%{__python2} setup.py compile_catalog -d build/lib/oslo_log/locale +%{__python3} setup.py compile_catalog -d build/lib/oslo_log/locale %install -%if 0%{?with_python3} %py3_install -mv %{buildroot}%{_bindir}/convert-json %{buildroot}%{_bindir}/convert-json-%{python3_version} -ln -s ./convert-json-%{python3_version} %{buildroot}%{_bindir}/convert-json-3 -%endif -%py2_install -ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-2 -ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-%{python2_version} - - # Install i18n .mo files (.po and .pot are not required) install -d -m 755 %{buildroot}%{_datadir} -rm -f %{buildroot}%{python2_sitelib}/oslo_log/locale/*/LC_*/oslo_log*po -rm -f %{buildroot}%{python2_sitelib}/oslo_log/locale/*pot -mv %{buildroot}%{python2_sitelib}/oslo_log/locale %{buildroot}%{_datadir}/locale -%if 0%{?with_python3} -rm -rf %{buildroot}%{python3_sitelib}/oslo_log/locale -%endif +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 # Find language files %find_lang oslo_log --all-name %check -%{__python2} setup.py test -%if 0%{?with_python3} -rm -rf .testrepository -%{__python3} setup.py test -%endif - -%files -n python2-%{pkg_name} -%doc README.rst ChangeLog AUTHORS -%license LICENSE -%{python2_sitelib}/oslo_log -%{python2_sitelib}/*.egg-info -%{_bindir}/convert-json -%{_bindir}/convert-json-2 -%{_bindir}/convert-json-%{python2_version} -%exclude %{python2_sitelib}/oslo_log/tests +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 %if 0%{?with_doc} %files -n python-%{pkg_name}-doc @@ -239,30 +138,25 @@ rm -rf .testrepository %license LICENSE %endif -%files -n python2-%{pkg_name}-tests -%{python2_sitelib}/oslo_log/tests - %files -n python-%{pkg_name}-lang -f oslo_log.lang %license LICENSE -%if 0%{?with_python3} %files -n python3-%{pkg_name} %doc README.rst ChangeLog AUTHORS %license LICENSE %{python3_sitelib}/oslo_log %{python3_sitelib}/*.egg-info -%{_bindir}/convert-json-3 -%{_bindir}/convert-json-%{python3_version} +%{_bindir}/convert-json %exclude %{python3_sitelib}/oslo_log/tests -%endif -%if 0%{?with_python3} %files -n python3-%{pkg_name}-tests %{python3_sitelib}/oslo_log/tests -%endif %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