From bd57f6542f680dee91567de92aa888637a9f4a66fc50d56c9f90626c0e323238 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 14 Mar 2020 11:46:01 +0000 Subject: [PATCH 1/2] - switch to python 3.x only builds OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-osprofiler?expand=0&rev=27 --- python-osprofiler.changes | 5 +++ python-osprofiler.spec | 76 +++++++++++++++------------------------ 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/python-osprofiler.changes b/python-osprofiler.changes index 10197cd..611898a 100644 --- a/python-osprofiler.changes +++ b/python-osprofiler.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 14 11:45:55 UTC 2020 - Dirk Mueller + +- switch to python 3.x only builds + ------------------------------------------------------------------- Wed Oct 9 12:39:40 UTC 2019 - cloud-devel@suse.de diff --git a/python-osprofiler.spec b/python-osprofiler.spec index 79498c8..a4da272 100644 --- a/python-osprofiler.spec +++ b/python-osprofiler.spec @@ -1,7 +1,7 @@ # # spec file for package python-osprofiler # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,22 +25,6 @@ Group: Development/Languages/Python URL: https://launchpad.net/osprofiler Source0: https://files.pythonhosted.org/packages/source/o/osprofiler/osprofiler-2.8.2.tar.gz BuildRequires: openstack-macros -BuildRequires: python2-PrettyTable >= 0.7.2 -BuildRequires: python2-WebOb >= 1.7.1 -BuildRequires: python2-ddt -BuildRequires: python2-docutils -BuildRequires: python2-elasticsearch -BuildRequires: python2-mock -BuildRequires: python2-oslo.concurrency >= 3.26.0 -BuildRequires: python2-oslo.config -BuildRequires: python2-oslo.log -BuildRequires: python2-oslo.utils >= 3.33.0 -BuildRequires: python2-pymongo -BuildRequires: python2-python-subunit -BuildRequires: python2-redis -BuildRequires: python2-six >= 1.10.0 -BuildRequires: python2-stestr -BuildRequires: python2-testtools BuildRequires: python3-PrettyTable >= 0.7.2 BuildRequires: python3-WebOb >= 1.7.1 BuildRequires: python3-ddt @@ -57,23 +41,7 @@ BuildRequires: python3-redis BuildRequires: python3-six >= 1.10.0 BuildRequires: python3-stestr BuildRequires: python3-testtools -Requires: python-PrettyTable >= 0.7.2 -Requires: python-WebOb >= 1.7.1 -Requires: python-oslo.concurrency >= 3.26.0 -Requires: python-oslo.config -Requires: python-oslo.log -Requires: python-oslo.utils >= 3.33.0 -Requires: python-six >= 1.10.0 BuildArch: noarch -%if 0%{?suse_version} -Requires(post): update-alternatives -Requires(postun): update-alternatives -%else -# on RDO, update-alternatives is in chkconfig -Requires(post): chkconfig -Requires(postun): chkconfig -%endif -%python_subpackages %description OSProfiler provides a tiny but powerful library that is used by @@ -83,6 +51,27 @@ through all involved services. This trace can then be extracted and used to build a tree of calls which can be quite handy for a variety of reasons (for example in isolating cross-project performance issues). +%package -n python3-osprofiler +Summary: OpenStack Profiler Library +Group: Development/Languages/Python +Requires: python3-PrettyTable >= 0.7.2 +Requires: python3-WebOb >= 1.7.1 +Requires: python3-oslo.concurrency >= 3.26.0 +Requires: python3-oslo.config +Requires: python3-oslo.log +Requires: python3-oslo.utils >= 3.33.0 +Requires: python3-six >= 1.10.0 + +%description -n python3-osprofiler +OSProfiler provides a tiny but powerful library that is used by +most (soon to be all) OpenStack projects and their python clients. It +provides functionality to be able to generate 1 trace per request, that goes +through all involved services. This trace can then be extracted and used +to build a tree of calls which can be quite handy for a variety of +reasons (for example in isolating cross-project performance issues). + +This package contains the Python 3.x module + %package -n python-osprofiler-doc Summary: Documentation for OSProfiler Group: Development/Languages/Python @@ -97,32 +86,25 @@ Documentation for OSProfiler. %py_req_cleanup %build -%{python_build} +%{py3_build} %install -%{python_install} -%python_clone -a %{buildroot}%{_bindir}/osprofiler +%{py3_install} # generate html docs PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} -%post -%python_install_alternative osprofiler - -%postun -%python_uninstall_alternative osprofiler - %check -%python_exec -m stestr.cli run --black-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)' +python3 -m stestr.cli run --black-regex '(^osprofiler.tests.unit.drivers.test_jaeger.JaegerTestCase.*$)' -%files %{python_files} +%files -n python3-osprofiler %license LICENSE %doc README.rst ChangeLog -%{python_sitelib}/osprofiler -%{python_sitelib}/*.egg-info -%python_alternative %{_bindir}/osprofiler +%{python3_sitelib}/osprofiler +%{python3_sitelib}/*.egg-info +%{_bindir}/osprofiler %files -n python-osprofiler-doc %license LICENSE From 1b8383e9ef919295846a81913f2587ed16aec8b43fe60171201b5eba6d5884c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 23 Mar 2020 12:16:38 +0000 Subject: [PATCH 2/2] - add obsoletes OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-osprofiler?expand=0&rev=28 --- python-osprofiler.changes | 5 +++++ python-osprofiler.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/python-osprofiler.changes b/python-osprofiler.changes index 611898a..010004e 100644 --- a/python-osprofiler.changes +++ b/python-osprofiler.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 23 12:16:26 UTC 2020 - Dirk Mueller + +- add obsoletes + ------------------------------------------------------------------- Sat Mar 14 11:45:55 UTC 2020 - Dirk Mueller diff --git a/python-osprofiler.spec b/python-osprofiler.spec index a4da272..df1f2b9 100644 --- a/python-osprofiler.spec +++ b/python-osprofiler.spec @@ -61,6 +61,9 @@ Requires: python3-oslo.config Requires: python3-oslo.log Requires: python3-oslo.utils >= 3.33.0 Requires: python3-six >= 1.10.0 +%if 0%{?suse_version} +Obsoletes: python2-osprofiler < 3.0.0 +%endif %description -n python3-osprofiler OSProfiler provides a tiny but powerful library that is used by