From a61c1e39ff1338e2eabda4a65bea91e1386394c7bb989db3c5674c6ead0a9022 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Thu, 9 Dec 2021 10:20:08 +0000
Subject: [PATCH] - Remove unnecessary patches: pytest4.patch, pytest6.patch,
 and   python38.patch.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygal?expand=0&rev=19
---
 pytest4.patch        | 16 ----------------
 pytest6.patch        | 16 ----------------
 python-pygal.changes |  6 ++++++
 python-pygal.spec    |  4 ++--
 python38.patch       | 30 ------------------------------
 5 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 pytest4.patch
 delete mode 100644 pytest6.patch
 delete mode 100644 python38.patch

diff --git a/pytest4.patch b/pytest4.patch
deleted file mode 100644
index 9145600..0000000
--- a/pytest4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,13 +1,6 @@
- [wheel]
- universal = 1
- 
--[pytest]
--flake8-ignore = 
--	*.py E731 E402
--	pygal/__init__.py F401
--	pygal/_compat.py F821 F401
--	docs/conf.py ALL
--
- [egg_info]
- tag_build = 
- tag_date = 0
diff --git a/pytest6.patch b/pytest6.patch
deleted file mode 100644
index a5515a3..0000000
--- a/pytest6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 5eb4620..d363446 100644
--- a/python-pygal.changes
+++ b/python-pygal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  9 10:19:36 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Remove unnecessary patches: pytest4.patch, pytest6.patch, and
+  python38.patch.
+
 -------------------------------------------------------------------
 Wed Dec  8 10:36:58 UTC 2021 - pgajdos@suse.com
 
diff --git a/python-pygal.spec b/python-pygal.spec
index d048b57..1f5b399 100644
--- a/python-pygal.spec
+++ b/python-pygal.spec
@@ -48,8 +48,8 @@ Pygal is a dynamic SVG charting library written in python.
 It supports various chart types and CSS styling.
 
 %prep
-%setup -q -n pygal-%{version}
-%autopatch -p1
+%autosetup -p1 -n pygal-%{version}
+
 # not sure where to report
 sed -Ei 's:.pytest-runner.,?::' setup.py
 
diff --git a/python38.patch b/python38.patch
deleted file mode 100644
index 44ad45e..0000000
--- a/python38.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 45be172a9b5ce6fcf8bab89685ea88955192d474 Mon Sep 17 00:00:00 2001
-From: Dooley_labs <elderlabs@users.noreply.github.com>
-Date: Mon, 15 Jul 2019 04:57:57 -0400
-Subject: [PATCH] Patch Python 3.8 deprecation warning
-
-This warning has been plaguing me. This fixes it. Forever.
-```
-py.warnings:110 - .../pygal/_compat.py:23: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
-```
----
- pygal/_compat.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pygal/_compat.py b/pygal/_compat.py
-index 07ab8846..2c6ab12b 100644
---- a/pygal/_compat.py
-+++ b/pygal/_compat.py
-@@ -20,8 +20,11 @@
- from __future__ import division
- 
- import sys
--from collections import Iterable
- from datetime import datetime, timedelta, tzinfo
-+try:
-+    from collections.abc import Iterable
-+except ImportError:
-+    from collections import Iterable
- 
- if sys.version_info[0] == 3:
-     base = (str, bytes)