Control: tags 977132 + patch
Control: tags 977132 + pending
Dear maintainer,
I've prepared an NMU for python-pygal (versioned as 2.4.0-2.2) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru python-pygal-2.4.0/debian/changelog python-pygal-2.4.0/debian/changelog
--- python-pygal-2.4.0/debian/changelog 2019-10-08 03:53:48.000000000 +0300
+++ python-pygal-2.4.0/debian/changelog 2021-02-11 20:52:21.000000000 +0200
@@ -1,3 +1,10 @@
+python-pygal (2.4.0-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with pytest 6. (Closes: #977132)
+
+ -- Adrian Bunk <b...@debian.org> Thu, 11 Feb 2021 20:52:21 +0200
+
python-pygal (2.4.0-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru python-pygal-2.4.0/debian/patches/0001-Fix-test-failures-due-to-removed-attribute-in-pytest.patch python-pygal-2.4.0/debian/patches/0001-Fix-test-failures-due-to-removed-attribute-in-pytest.patch
--- python-pygal-2.4.0/debian/patches/0001-Fix-test-failures-due-to-removed-attribute-in-pytest.patch 1970-01-01 02:00:00.000000000 +0200
+++ python-pygal-2.4.0/debian/patches/0001-Fix-test-failures-due-to-removed-attribute-in-pytest.patch 2021-02-11 20:52:21.000000000 +0200
@@ -0,0 +1,29 @@
+From 06d58181ff553e9b5c818256b379a336818b9a2f Mon Sep 17 00:00:00 2001
+From: Julien Sanchez <julien.sanc...@kozea.fr>
+Date: Mon, 12 Oct 2020 15:05:43 +0200
+Subject: Fix test failures due to removed attribute in pytest
+
+Replace removed `funcargnames` attribute with newer `fixturenames`.
+---
+ pygal/test/conftest.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py
+index b8c8a59..21e2801 100644
+--- a/pygal/test/conftest.py
++++ b/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",
+ [
+--
+2.20.1
+
diff -Nru python-pygal-2.4.0/debian/patches/series python-pygal-2.4.0/debian/patches/series
--- python-pygal-2.4.0/debian/patches/series 2019-10-08 03:53:16.000000000 +0300
+++ python-pygal-2.4.0/debian/patches/series 2021-02-11 20:52:20.000000000 +0200
@@ -1 +1,2 @@
setup.cfg-pytest.patch
+0001-Fix-test-failures-due-to-removed-attribute-in-pytest.patch
