From fdb169de9c1e942b1890c23e2a940f86930c31773d4fc248672a0dd40c918973 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 16 Apr 2021 07:30:13 +0000 Subject: [PATCH 1/2] - temp disable testing to fix cycle with pytest OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MarkupSafe?expand=0&rev=30 --- python-MarkupSafe.changes | 5 +++++ python-MarkupSafe.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-MarkupSafe.changes b/python-MarkupSafe.changes index b2afa42..ff9ae04 100644 --- a/python-MarkupSafe.changes +++ b/python-MarkupSafe.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 16 07:30:01 UTC 2021 - Dirk Müller + +- temp disable testing to fix cycle with pytest + ------------------------------------------------------------------- Tue Mar 5 16:46:50 UTC 2019 - Tomáš Chvátal diff --git a/python-MarkupSafe.spec b/python-MarkupSafe.spec index 3f1806e..95d6376 100644 --- a/python-MarkupSafe.spec +++ b/python-MarkupSafe.spec @@ -1,7 +1,7 @@ # # spec file for package python-MarkupSafe # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # +%bcond_with test %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-MarkupSafe @@ -27,7 +28,9 @@ License: BSD-3-Clause Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz BuildRequires: %{python_module devel} +%if %{with test} BuildRequires: %{python_module pytest} +%endif BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -55,8 +58,10 @@ export CFLAGS="%{optflags}" %python_expand %fdupes %{buildroot}%{$python_sitearch} %python_expand rm %{buildroot}%{$python_sitearch}/markupsafe/_speedups.c +%if %{with test} %check %python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m pytest +%endif %files %{python_files} %license LICENSE.rst From db43ba758a3059deb9995c0dbf4b39a26c820a8ae52bf8eb5fe862b5d7970877 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 16 Apr 2021 07:39:15 +0000 Subject: [PATCH 2/2] - allow tests to be disabled (still on by default) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MarkupSafe?expand=0&rev=31 --- python-MarkupSafe.changes | 2 +- python-MarkupSafe.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-MarkupSafe.changes b/python-MarkupSafe.changes index ff9ae04..aa075bb 100644 --- a/python-MarkupSafe.changes +++ b/python-MarkupSafe.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Apr 16 07:30:01 UTC 2021 - Dirk Müller -- temp disable testing to fix cycle with pytest +- allow tests to be disabled (still on by default) ------------------------------------------------------------------- Tue Mar 5 16:46:50 UTC 2019 - Tomáš Chvátal diff --git a/python-MarkupSafe.spec b/python-MarkupSafe.spec index 95d6376..0ac8eac 100644 --- a/python-MarkupSafe.spec +++ b/python-MarkupSafe.spec @@ -16,7 +16,7 @@ # -%bcond_with test +%bcond_without test %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-MarkupSafe