From b805ee04d74e222ddd77085c41636703c7f1a27692350fdcc67ddd6838923935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 27 Aug 2020 19:45:28 +0000 Subject: [PATCH] Accepting request 830032 from home:mcalabkova:branches:devel:languages:python:pytest - Add patch pytest6.patch OBS-URL: https://build.opensuse.org/request/show/830032 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygal?expand=0&rev=14 --- pytest6.patch | 16 ++++++++++++++++ python-pygal.changes | 5 +++++ python-pygal.spec | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pytest6.patch diff --git a/pytest6.patch b/pytest6.patch new file mode 100644 index 0000000..a5515a3 --- /dev/null +++ b/pytest6.patch @@ -0,0 +1,16 @@ +Index: pygal-2.4.0/pygal/test/conftest.py +=================================================================== +--- pygal-2.4.0.orig/pygal/test/conftest.py ++++ pygal-2.4.0/pygal/test/conftest.py +@@ -50,9 +50,9 @@ def pytest_generate_tests(metafunc): + if hasattr(sys, 'pypy_version_info'): + etree.to_etree() + +- if "Chart" in metafunc.funcargnames: ++ if "Chart" in metafunc.fixturenames: + metafunc.parametrize("Chart", pygal.CHARTS) +- if "datas" in metafunc.funcargnames: ++ if "datas" in metafunc.fixturenames: + metafunc.parametrize( + "datas", + [ diff --git a/python-pygal.changes b/python-pygal.changes index 5674717..6c4d6c2 100644 --- a/python-pygal.changes +++ b/python-pygal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 15:15:44 UTC 2020 - Marketa Calabkova + +- Add patch pytest6.patch + ------------------------------------------------------------------- Wed Nov 6 15:16:36 CET 2019 - Matej Cepl diff --git a/python-pygal.spec b/python-pygal.spec index 9165b8a..1ad3293 100644 --- a/python-pygal.spec +++ b/python-pygal.spec @@ -1,7 +1,7 @@ # # spec file for package python-pygal # -# 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 @@ -30,6 +30,7 @@ Patch0: python38.patch # PATCH-FIX-UPSTREAM pytest4.patch gh#Kozea/pygal#340 mcepl@suse.com # yes, THIS is what makes this test suite pytest4+ compatible! Patch1: pytest4.patch +Patch2: pytest6.patch BuildRequires: %{python_module Flask} BuildRequires: %{python_module lxml} BuildRequires: %{python_module pyquery}