From ee9800c4fa880995a377f4748178670e60270590311f852477dcff00b3fe2b1d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 6 Oct 2021 07:51:06 +0000 Subject: [PATCH] - Add multibuild to separate test phase from the build one. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysmi?expand=0&rev=23 --- _multibuild | 3 +++ python-pysmi.changes | 5 +++++ python-pysmi.spec | 29 +++++++++++++++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-pysmi.changes b/python-pysmi.changes index fca2547..089527b 100644 --- a/python-pysmi.changes +++ b/python-pysmi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 6 07:40:43 UTC 2021 - Matej Cepl + +- Add multibuild to separate test phase from the build one. + ------------------------------------------------------------------- Tue Oct 5 15:33:49 UTC 2021 - Stefan Schubert diff --git a/python-pysmi.spec b/python-pysmi.spec index 85c0157..64473cd 100644 --- a/python-pysmi.spec +++ b/python-pysmi.spec @@ -1,5 +1,5 @@ # -# spec file for package python-pysmi +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -23,7 +23,15 @@ %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-pysmi +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-pysmi%{psuffix} Version: 0.3.4 Release: 0 Summary: SNMP SMI/MIB Parser @@ -33,13 +41,16 @@ Source: https://files.pythonhosted.org/packages/source/p/pysmi/pysmi-%{v BuildRequires: %{python_module ply} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 +%if %{with test} +BuildRequires: %{python_module pysnmp} +%endif Requires: python-ply %if %{with libalternatives} BuildRequires: alts Requires: alts %else Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %endif BuildArch: noarch %python_subpackages @@ -57,13 +68,21 @@ Documentation: http://pysmi.sf.net %python_build %install +%if !%{with test} %python_install mv %{buildroot}%{_bindir}/mibdump.py %{buildroot}%{_bindir}/mibdump mv %{buildroot}%{_bindir}/mibcopy.py %{buildroot}%{_bindir}/mibcopy %python_clone -a %{buildroot}%{_bindir}/mibdump %python_clone -a %{buildroot}%{_bindir}/mibcopy %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%check +%if %{with test} +%pyunittest -v tests +%endif + +%if !%{with test} %pre # If libalternatives is used: Removing old update-alternatives entries. %python_libalternatives_reset_alternative mibdump @@ -74,14 +93,12 @@ mv %{buildroot}%{_bindir}/mibcopy.py %{buildroot}%{_bindir}/mibcopy %postun %python_uninstall_alternative mibdump -#%%check -#nosetests # cannot be run without pysmnp which needs this package - %files %{python_files} %license LICENSE.rst %doc README.md CHANGES.rst %{python_sitelib}/* %python_alternative %{_bindir}/mibdump %python_alternative %{_bindir}/mibcopy +%endif %changelog