- 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
This commit is contained in:
Matej Cepl 2021-12-09 10:20:08 +00:00 committed by Git OBS Bridge
parent 5af1fbfdde
commit a61c1e39ff
5 changed files with 8 additions and 64 deletions

View File

@ -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

View File

@ -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",
[

View File

@ -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

View File

@ -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

View File

@ -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)