[gentoo-commits] repo/gentoo:master commit in: dev-python/pygal/, dev-python/pygal/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pygal/, dev-python/pygal/files/

[Thomas Deutschmann]

commit:     0c3e9e0342fe37d89baf01af7cd7effb9fdd6f0f
Author:     Andreas Zuber <a.zuber <AT> gmx <DOT> ch>
AuthorDate: Wed Mar 17 10:58:41 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May 18 21:27:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3e9e03

dev-python/pygal: python 3.9 and tests fix

Closes: https://bugs.gentoo.org/738208
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Zuber <a.zuber <AT> gmx.ch>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-python/pygal/files/2.4.0-fix-tests.patch            | 17 +++++++++++++++++
 .../{pygal-2.4.0-r1.ebuild => pygal-2.4.0-r2.ebuild}    |  6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-python/pygal/files/2.4.0-fix-tests.patch b/dev-python/pygal/files/2.4.0-fix-tests.patch
new file mode 100644
index 00000000000..6ae07df3427
--- /dev/null
+++ b/dev-python/pygal/files/2.4.0-fix-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py
+index ea36010..6fe40cb 100644
+--- a/pygal/test/conftest.py
++++ b/pygal/test/conftest.py
+@@ -48,9 +48,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", [[("Serie %d" % i, get_data(i)) for i in range(s)]
+                       for s in (5, 1, 0)]
+--

diff --git a/dev-python/pygal/pygal-2.4.0-r1.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild
similarity index 90%
rename from dev-python/pygal/pygal-2.4.0-r1.ebuild
rename to dev-python/pygal/pygal-2.4.0-r2.ebuild
index d99f0e5a873..b886f7767a6 100644
--- a/dev-python/pygal/pygal-2.4.0-r1.ebuild
+++ b/dev-python/pygal/pygal-2.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -29,6 +29,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
+
 # CHANGELOG is a symlink to docs/changelog.rst
 DOCS=( docs/changelog.rst README.md )
 

[gentoo-commits] repo/gentoo:master commit in: dev-python/pygal/, dev-python/pygal/files/

[Michał Górny]

commit:     75e8a99d71b7d4ba36da5e722aed50c3511fa39a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 20:49:14 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 21:27:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e8a99d

dev-python/pygal: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pygal/Manifest                          |  1 -
 .../pygal/files/pygal-2.4.0-fix-py3.10.patch       | 39 -------------------
 dev-python/pygal/files/pygal-2.4.0-fix-tests.patch | 17 --------
 dev-python/pygal/pygal-2.4.0-r2.ebuild             | 45 ----------------------
 4 files changed, 102 deletions(-)

diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index c7a3153ebdfc..932c7ae4057a 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,2 +1 @@
-DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
 DIST pygal-3.0.0.tar.gz 3575455 BLAKE2B 9b64cf441aeb25b0a0b9834f07e5892fe163f28a5da796d37083f8f3a10d8737a69bad39e503d722e6a36f2de4367b4fd2bdc3a06c5bc30bce66a370690d9c88 SHA512 71ac9f197d711c8cf5bb47caef128754f81b1cb0ba98c4cc67de78b68fca5d40baae9fbb5c978f6abaed4c73b8edfea2de07de2fda1aa7c15e0d81387518cc49

diff --git a/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch b/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch
deleted file mode 100644
index ded4ad2ef338..000000000000
--- a/dev-python/pygal/files/pygal-2.4.0-fix-py3.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1525f5e7c18032b34b1be282341d60641161194d Mon Sep 17 00:00:00 2001
-From: Dooley_labs <elderlabs@users.noreply.github.com>
-Date: Sat, 28 Dec 2019 02:29:38 -0500
-Subject: [PATCH] Python 3 compatibility patches
-
----
- pygal/_compat.py | 5 ++++-
- pygal/util.py    | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pygal/_compat.py b/pygal/_compat.py
-index 07ab8846..815585f1 100644
---- a/pygal/_compat.py
-+++ b/pygal/_compat.py
-@@ -20,7 +20,10 @@
- from __future__ import division
- 
- import sys
--from collections import Iterable
-+try:
-+    from collections.abc import Iterable
-+except ImportError:
-+    from collections import Iterable
- from datetime import datetime, timedelta, tzinfo
- 
- if sys.version_info[0] == 3:
-diff --git a/pygal/util.py b/pygal/util.py
-index 65236173..cca29dbf 100644
---- a/pygal/util.py
-+++ b/pygal/util.py
-@@ -275,7 +275,7 @@ def minify_css(css):
-     # Inspired by slimmer by Peter Bengtsson
-     remove_next_comment = 1
-     for css_comment in css_comments.findall(css):
--        if css_comment[-3:] == '\*/':
-+        if css_comment[-3:] == r'\*/':
-             remove_next_comment = 0
-             continue
-         if remove_next_comment:

diff --git a/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch b/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch
deleted file mode 100644
index 6ae07df3427b..000000000000
--- a/dev-python/pygal/files/pygal-2.4.0-fix-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py
-index ea36010..6fe40cb 100644
---- a/pygal/test/conftest.py
-+++ b/pygal/test/conftest.py
-@@ -48,9 +48,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", [[("Serie %d" % i, get_data(i)) for i in range(s)]
-                       for s in (5, 1, 0)]
---

diff --git a/dev-python/pygal/pygal-2.4.0-r2.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild
deleted file mode 100644
index dad973603437..000000000000
--- a/dev-python/pygal/pygal-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A python SVG charts generator"
-HOMEPAGE="https://github.com/Kozea/pygal/"
-# PyPI tarballs do not contain docs
-# https://github.com/Kozea/pygal/pull/428
-SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? ( dev-python/pyquery[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-tests.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-# CHANGELOG is a symlink to docs/changelog.rst
-DOCS=( docs/changelog.rst README.md )
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Not actually required unless we want to do setup.py test
-	# https://github.com/Kozea/pygal/issues/430
-	sed -i -e "/setup_requires/d" setup.py || die
-	# [pytest] section in setup.cfg files is no longer supported
-	sed -i -e 's@\[pytest\]@[tool:pytest]@' setup.cfg || die
-	distutils-r1_python_prepare_all
-}