From 9c9605c85b3d554791e66733f25855f0fd9b9ea6c2e64d56d1b71961c5412293 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Tue, 30 May 2023 06:16:17 +0000 Subject: [PATCH 1/2] - Remove duplicate sle15_python_module_pythons macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ini2toml?expand=0&rev=16 --- python-ini2toml.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-ini2toml.spec b/python-ini2toml.spec index ca19a40..4a7e2ca 100644 --- a/python-ini2toml.spec +++ b/python-ini2toml.spec @@ -49,7 +49,6 @@ %bcond_with experimental %define skip_python2 1 -%{?sle15_python_module_pythons} Name: python-ini2toml%{psuffix} Version: 0.12 Release: 0 From 55dfb30e67708e18f5cc7ab0d18548c967f936b512949159eb03ecab29849822 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Tue, 30 May 2023 06:28:09 +0000 Subject: [PATCH 2/2] - Remove ConfigUpdater dependency for tests when it's not building for the -full or -all subpackage. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ini2toml?expand=0&rev=17 --- python-ini2toml.changes | 6 ++++++ python-ini2toml.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-ini2toml.changes b/python-ini2toml.changes index e207cba..bd42cbf 100644 --- a/python-ini2toml.changes +++ b/python-ini2toml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 06:22:39 UTC 2023 - Daniel Garcia + +- Remove ConfigUpdater dependency for tests when it's not building for + the -full or -all subpackage. + ------------------------------------------------------------------- Fri May 5 00:13:56 UTC 2023 - Dirk Müller diff --git a/python-ini2toml.spec b/python-ini2toml.spec index 4a7e2ca..8d674dd 100644 --- a/python-ini2toml.spec +++ b/python-ini2toml.spec @@ -63,7 +63,6 @@ Requires: python-packaging >= 20.7 Requires(post): update-alternatives Requires(postun):update-alternatives %if %{with test} -BuildRequires: %{python_module ConfigUpdater} BuildRequires: %{python_module packaging >= 20.7} BuildRequires: %{python_module pytest} BuildRequires: %{python_module validate-pyproject >= 0.6 with %python-validate-pyproject < 2} @@ -76,6 +75,11 @@ BuildRequires: %{python_module ini2toml-full = %{version}} %if %{with all} BuildRequires: %{python_module ini2toml-all = %{version}} %endif + +%if %{with full} || %{with all} +BuildRequires: %{python_module ConfigUpdater} +%endif + %if %{with experimental} BuildRequires: %{python_module ini2toml-experimental = %{version}} %endif @@ -163,6 +167,7 @@ ignoretests=( --ignore tests/plugins/test_mypy.py --ignore tests/plugins/test_pytest.py --ignore tests/plugins/test_setuptools_pep621.py + --ignore tests/plugins/test_toml_incompatibilities.py ) %endif %if %{without experimental}