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

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

[Michał Górny]

commit:     b6a6ba79829873cdb3213421b694f5f52f31e816
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 19:20:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 19:37:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a6ba79

dev-python/pydot: Remove old (py2)

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

 dev-python/pydot/Manifest                          |  2 --
 dev-python/pydot/files/pydot-1.0.23-setup.patch    | 21 ---------------
 .../pydot/files/pydot-1.0.28-pyparsing2fix.patch   | 14 ----------
 dev-python/pydot/pydot-1.0.28-r2.ebuild            | 27 -------------------
 dev-python/pydot/pydot-1.2.3.ebuild                | 30 ----------------------
 5 files changed, 94 deletions(-)

diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index e9cea972d70..9ff10b2684c 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,3 +1 @@
-DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef60edd9d0515ebfc9c685aba09dc42f89849c1eb609e469a4036062d3f0b83b364d89557f73414143c2c78d59 SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055
-DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938

diff --git a/dev-python/pydot/files/pydot-1.0.23-setup.patch b/dev-python/pydot/files/pydot-1.0.23-setup.patch
deleted file mode 100644
index c87cc32b30d..00000000000
--- a/dev-python/pydot/files/pydot-1.0.23-setup.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -1,9 +1,9 @@
- #!/usr/bin/env python
- 
- try:
--    from distutils.core import setup
--except ImportError, excp:
-     from setuptools import setup
-+except ImportError, excp:
-+    from distutils.core import setup
-     
- import pydot
- import os
-@@ -31,5 +31,4 @@
-         'Topic :: Software Development :: Libraries :: Python Modules'],
-     long_description = "\n".join(pydot.__doc__.split('\n')),
-     py_modules = ['pydot', 'dot_parser'],
--    install_requires = ['pyparsing', 'setuptools'],
--    data_files = [('.', ['LICENSE', 'README'])] )
-+    install_requires = ['pyparsing', 'setuptools'] )

diff --git a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
deleted file mode 100644
index 12a01091223..00000000000
--- a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
---- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
-+++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
-@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
- from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
-     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
-     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
--    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
-+    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
- 
-+_noncomma = "".join( [ c for c in printables if c != "," ] )
- 
- class P_AttrList:
- 

diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
deleted file mode 100644
index 5c92facbb11..00000000000
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://pypi.org/project/pydot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.23-setup.patch
-	"${FILESDIR}"/${P}-pyparsing2fix.patch )

diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
deleted file mode 100644
index 1fd6811bffa..00000000000
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot/"
-# pypi releases don't include tests
-SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
-}

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

[Michał Górny]

commit:     1a6e9c2bb681945380dd62bf5b915370b991247e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 10:28:05 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 11:07:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6e9c2b

dev-python/pydot: Fix failing tests

Closes: https://bugs.gentoo.org/691248
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pydot/files/pydot-1.4.1-unittest.patch | 74 +++++++++++++++++++++++
 dev-python/pydot/pydot-1.4.1.ebuild               |  4 ++
 2 files changed, 78 insertions(+)

diff --git a/dev-python/pydot/files/pydot-1.4.1-unittest.patch b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
new file mode 100644
index 00000000000..b3c0d0e426b
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.4.1-unittest.patch
@@ -0,0 +1,74 @@
+From a10ced4d132361027a545a471af4541dea8c5cf5 Mon Sep 17 00:00:00 2001
+From: Peter Nowee <peter@peternowee.com>
+Date: Wed, 26 Jun 2019 15:43:38 +0800
+Subject: [PATCH] Fix multi.dot Graphviz regression test
+
+Commit d6602ad of 2018-12-01 fixed the regression test broken by commit
+2d55978 of 2016-07-01. This revealed that `test/graphs/multi.dot` was
+failing.
+
+`multi.dot` was introduced in commit 2b3f088 of 2010-11-07 together
+with many of the other tests still here today. It has not been touched
+since. It is a DOT-file containing two digraphs. The regression test
+compares the JPEG images rendered from the DOT-file by pydot with those
+rendered by Graphviz's dot directly.
+
+Commit 66734d2 of 2016-07-01 is the actual cause of the failure. It
+changed one of the render methods of the regression test,
+`_render_with_pydot`, from calculating a single hash for all the JPEG
+images to calculating separate hashes for each JPEG image and then
+concatenating those hashes in one long string. The other render method,
+`_render_with_graphviz`, still calculates a single hash over all data.
+For DOT-files that generate only one image the end result is the same,
+but because `multi.dot` has two graphs, it produces two images and this
+leads to comparing a string of two hashes with one single hash.
+
+I do not think the change in generating the hash was intentional, for
+the following reasons:
+- Commit 66734d2 states that its purpose was to adapt the test to an
+  API change in pydot. It does not mention a deliberate choice to
+  change the testing method.
+- There was no effort to change `_render_with_graphviz` to also produce
+  multiple hashes.
+- Except for easier debugging in case of a failing test with multiple
+  images (AFAICT, only `multi.dot`), I do not see much added benefit in
+  checking a concatenation of the hashes of all images vs. checking one
+  hash of all images together: In both cases the test will fail if one
+  or more images is rendered differently.
+- Given that there were many commits authored that same hour, including
+  commit 2d55978 which broke the regression tests, I suspect the author
+  did not run the tests for each individual commit, but only at the end
+  of that batch, and was therefore also not alerted of this change by
+  the test suite.
+
+Assuming that the change was not intended, this commit will now revert
+`_render_with_pydot` to the old behavior of calculating a single hash
+from all JPEG image data.
+
+Tested with Debian 9.9, Graphviz 2.38.0-17, Python 2.7.13-2 and 3.5.3-1.
+
+Fixes https://github.com/pydot/pydot/issues/204.
+---
+ test/pydot_unittest.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/pydot_unittest.py b/test/pydot_unittest.py
+index 881ee16..64aa856 100644
+--- a/test/pydot_unittest.py
++++ b/test/pydot_unittest.py
+@@ -194,11 +194,11 @@ def _render_with_graphviz(self, filename, encoding):
+ 
+     def _render_with_pydot(self, filename, encoding):
+         c = pydot.graph_from_dot_file(filename, encoding=encoding)
+-        sha = ''
++        jpe_data = bytearray()
+         for g in c:
+-            jpe_data = g.create(prog=TEST_PROGRAM, format='jpe', encoding=encoding)
+-            sha += sha256(jpe_data).hexdigest()
+-        return sha
++            jpe_data.extend(g.create(prog=TEST_PROGRAM, format='jpe',
++                                     encoding=encoding))
++        return sha256(jpe_data).hexdigest()
+ 
+     def test_my_regression_tests(self):
+         path = os.path.join(test_dir, TESTS_DIR_1)

diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index fb2062cdb6d..1a3e1140998 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-unittest.patch
+)
+
 python_test() {
 	cd test || die
 	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"

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

[Sam James]

commit:     48e07ea8abd7fe63bf7c276eae7ffa956f9f64b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 20:08:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 20:08:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e07ea8

dev-python/pydot: workaround pyparsing-3 issue

Closes: https://bugs.gentoo.org/830676
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pydot/files/pydot-1.4.2-pyparsing-3.patch      | 22 +++++++++++++
 dev-python/pydot/pydot-1.4.2-r2.ebuild             | 36 ++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
new file mode 100644
index 000000000000..09d4c654ac17
--- /dev/null
+++ b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
@@ -0,0 +1,22 @@
+https://github.com/pydot/pydot/pull/281
+https://bugs.gentoo.org/830676
+
+(rebased)
+
+From 4ab2c033c0dd67cab87be9a9392c558359caf80c Mon Sep 17 00:00:00 2001
+From: Anton Bolshakov <blshkv@users.noreply.github.com>
+Date: Tue, 4 Jan 2022 16:05:51 +0800
+Subject: [PATCH] Update dot_parser.py
+
+https://github.com/pydot/pydot/issues/277
+--- a/dot_parser.py
++++ b/dot_parser.py
+@@ -439,6 +439,8 @@ def graph_definition():
+ 
+         noncomma = "".join([c for c in printables if c != ","])
+         alphastring_ = OneOrMore(CharsNotIn(noncomma + ' '))
++        # override pyparsing tightened whitespace-skipping logic
++        alphastring_.skipWhitespace = True
+ 
+         def parse_html(s, loc, toks):
+             return '<%s>' % ''.join(toks[0])

diff --git a/dev-python/pydot/pydot-1.4.2-r2.ebuild b/dev-python/pydot/pydot-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..db3881e7fab5
--- /dev/null
+++ b/dev-python/pydot/pydot-1.4.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://github.com/pydot/pydot https://pypi.org/project/pydot/"
+# pypi releases don't include tests
+SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+#	"${FILESDIR}"/${PN}-1.4.2-pyparsing-3.patch
+)
+
+python_test() {
+	cd test || die
+	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
+}

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

[Michał Górny]

commit:     a6cb477b4fb3f801591c842508c136eac79a210c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 04:28:58 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 04:28:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6cb477b

dev-python/pydot: Remove old

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

 dev-python/pydot/Manifest                          |  1 -
 .../pydot/files/pydot-1.4.2-pyparsing-3.patch      | 22 ---------
 dev-python/pydot/pydot-1.4.2-r4.ebuild             | 52 ----------------------
 3 files changed, 75 deletions(-)

diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 91b87540c67e..7f0890e5c6eb 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,2 +1 @@
-DIST pydot-1.4.2.gh.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
 DIST pydot-2.0.0.gh.tar.gz 275188 BLAKE2B 58f1598196861795bd44c6b97683e0c37b3c05e848a69d42a3fc898849f272466c989e7ff72e0be22a322a1e92c31c6b76a9317e56f3ec26743c20801daf8bfd SHA512 09102930a59ac4339e1d1e4f7a9d075f99eda6cb060885631a72f1fded90d001bd02940b55addc0c92856e95321cb3b344a1797b4809ac7c9048ac57c81d4707

diff --git a/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch b/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
deleted file mode 100644
index 09d4c654ac17..000000000000
--- a/dev-python/pydot/files/pydot-1.4.2-pyparsing-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/pydot/pydot/pull/281
-https://bugs.gentoo.org/830676
-
-(rebased)
-
-From 4ab2c033c0dd67cab87be9a9392c558359caf80c Mon Sep 17 00:00:00 2001
-From: Anton Bolshakov <blshkv@users.noreply.github.com>
-Date: Tue, 4 Jan 2022 16:05:51 +0800
-Subject: [PATCH] Update dot_parser.py
-
-https://github.com/pydot/pydot/issues/277
---- a/dot_parser.py
-+++ b/dot_parser.py
-@@ -439,6 +439,8 @@ def graph_definition():
- 
-         noncomma = "".join([c for c in printables if c != ","])
-         alphastring_ = OneOrMore(CharsNotIn(noncomma + ' '))
-+        # override pyparsing tightened whitespace-skipping logic
-+        alphastring_.skipWhitespace = True
- 
-         def parse_html(s, loc, toks):
-             return '<%s>' % ''.join(toks[0])

diff --git a/dev-python/pydot/pydot-1.4.2-r4.ebuild b/dev-python/pydot/pydot-1.4.2-r4.ebuild
deleted file mode 100644
index 1c80bcd8244e..000000000000
--- a/dev-python/pydot/pydot-1.4.2-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="
-	https://github.com/pydot/pydot/
-	https://pypi.org/project/pydot/
-"
-# pypi releases don't include tests
-SRC_URI="
-	https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/chardet[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.4.2-pyparsing-3.patch
-	)
-
-	# broken
-	rm test/my_tests/html_labels.dot || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd test || die
-	PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages \
-	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
-}