From 3fd26854e0521823564f0cf4ad35294cd8a39c33d7bf681a073499242a92c9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 31 Aug 2020 08:53:26 +0000 Subject: [PATCH] - Switch to multibuild to not cycle with numpy * update testdata OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-toml?expand=0&rev=13 --- _multibuild | 3 +++ python-toml.changes | 7 ++++++- python-toml.spec | 23 +++++++++++++++++++---- 3 files changed, 28 insertions(+), 5 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-toml.changes b/python-toml.changes index edae8a0..3474670 100644 --- a/python-toml.changes +++ b/python-toml.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 31 08:53:10 UTC 2020 - Tomáš Chvátal + +- Switch to multibuild to not cycle with numpy + ------------------------------------------------------------------- Mon Jun 8 10:32:52 UTC 2020 - Ondřej Súkup - update to 0.10.1 - * update testdata + * update testdata ------------------------------------------------------------------- Thu Mar 12 07:30:21 UTC 2020 - Tomáš Chvátal diff --git a/python-toml.spec b/python-toml.spec index 1b01214..17d905e 100644 --- a/python-toml.spec +++ b/python-toml.spec @@ -17,7 +17,15 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-toml +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-toml%{psuffix} Version: 0.10.1 Release: 0 Summary: Python module which parses and emits TOML @@ -28,13 +36,15 @@ Source: https://files.pythonhosted.org/packages/source/t/toml/toml-%{ver Source1: https://github.com/BurntSushi/toml-test/archive/280497f.tar.gz#/toml-test-280497f.tar.gz # Missing file https://github.com/uiri/toml/pull/231 Source2: https://raw.githubusercontent.com/uiri/toml/%{version}/test.toml -BuildRequires: %{python_module numpy} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: coreutils BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module numpy} +BuildRequires: %{python_module pytest} +%endif %python_subpackages %description @@ -63,17 +73,22 @@ cp %{SOURCE2} . %python_build %install +%if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check +%if %{with test} export LANG=en_US.UTF-8 %pytest +%endif +%if !%{with test} %files %{python_files} -# See https://github.com/uiri/toml/issues/216 re change log %license LICENSE %doc README.rst %{python_sitelib} +%endif %changelog