| 1 |
commit: 6af275b39b57cc7e008d7c6c4e816948b8f555ff |
| 2 |
Author: Horea Christian <chr <AT> chymera <DOT> eu> |
| 3 |
AuthorDate: Sun Aug 23 07:25:44 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 5 07:25:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af275b3 |
| 7 |
|
| 8 |
dev-python/pydotplus: PYTHON_COMPAT and EAPI update |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/695996 |
| 11 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 12 |
Signed-off-by: Horea Christian <chr <AT> chymera.eu> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/17228 |
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
.../pydotplus/files/pydotplus-2.0.2-tests.patch | 17 +++++++++ |
| 17 |
dev-python/pydotplus/metadata.xml | 4 +-- |
| 18 |
dev-python/pydotplus/pydotplus-2.0.2.ebuild | 40 +++++++++------------- |
| 19 |
profiles/package.mask | 1 - |
| 20 |
4 files changed, 36 insertions(+), 26 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..65d9c5f9f45 |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch |
| 27 |
@@ -0,0 +1,17 @@ |
| 28 |
+--- a/test/pydot_unittest.py |
| 29 |
++++ b/test/pydot_unittest.py |
| 30 |
+@@ -142,6 +142,7 @@ class TestGraphAPI(unittest.TestCase): |
| 31 |
+ self.assertEqual(g2.get_edges()[0].get_source(), node1) |
| 32 |
+ self.assertEqual(g2.get_edges()[0].get_destination(), node2) |
| 33 |
+ |
| 34 |
++ @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22") |
| 35 |
+ def test_graph_with_shapefiles(self): |
| 36 |
+ |
| 37 |
+ shapefile_dir = os.path.join(TEST_DIR, 'from-past-to-future') |
| 38 |
+@@ -225,6 +226,7 @@ class TestGraphAPI(unittest.TestCase): |
| 39 |
+ def test_my_regression_tests(self): |
| 40 |
+ self._render_and_compare_dot_files(MY_REGRESSION_TESTS_DIR) |
| 41 |
+ |
| 42 |
++ @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22") |
| 43 |
+ def test_graphviz_regression_tests(self): |
| 44 |
+ self._render_and_compare_dot_files(REGRESSION_TESTS_DIR) |
| 45 |
|
| 46 |
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml |
| 47 |
index 3f0fc2d5c2a..f90e5937722 100644 |
| 48 |
--- a/dev-python/pydotplus/metadata.xml |
| 49 |
+++ b/dev-python/pydotplus/metadata.xml |
| 50 |
@@ -10,8 +10,8 @@ |
| 51 |
<name>Proxy Maintainers</name> |
| 52 |
</maintainer> |
| 53 |
<longdescription lang="en"> |
| 54 |
- PyDotPlus is an improved version of the old pydot project that provides a Python |
| 55 |
- Interface to Graphviz’s Dot language. |
| 56 |
+ PyDotPlus is an improved version of the old pydot project that provides |
| 57 |
+ a Python Interface to Graphviz’s Dot language. |
| 58 |
</longdescription> |
| 59 |
<upstream> |
| 60 |
<remote-id type="pypi">pydotplus</remote-id> |
| 61 |
|
| 62 |
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild |
| 63 |
index f2a0a8effac..c8aa79de634 100644 |
| 64 |
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild |
| 65 |
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild |
| 66 |
@@ -1,38 +1,32 @@ |
| 67 |
# Copyright 1999-2020 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
-EAPI=6 |
| 71 |
+EAPI=7 |
| 72 |
|
| 73 |
-PYTHON_COMPAT=( python3_6 ) |
| 74 |
+PYTHON_COMPAT=( python3_{7,8} ) |
| 75 |
|
| 76 |
inherit distutils-r1 |
| 77 |
|
| 78 |
DESCRIPTION="Improved version of the old pydot project" |
| 79 |
-HOMEPAGE="http://pydotplus.readthedocs.org/" |
| 80 |
+HOMEPAGE="https://pydotplus.readthedocs.org/" |
| 81 |
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" |
| 82 |
|
| 83 |
LICENSE="MIT" |
| 84 |
SLOT="0" |
| 85 |
KEYWORDS="~amd64 ~x86" |
| 86 |
-IUSE="" |
| 87 |
- |
| 88 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 89 |
-# test? ( |
| 90 |
-# dev-python/flake8[${PYTHON_USEDEP}] |
| 91 |
-# dev-python/pytest[${PYTHON_USEDEP}] |
| 92 |
-# dev-python/pytest-cov[${PYTHON_USEDEP}] |
| 93 |
-# dev-python/sphinx[${PYTHON_USEDEP}] |
| 94 |
-# dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
| 95 |
-# dev-python/tox[${PYTHON_USEDEP}] |
| 96 |
-# ) |
| 97 |
+IUSE="test" |
| 98 |
+RESTRICT="!test? ( test )" |
| 99 |
+ |
| 100 |
RDEPEND=" |
| 101 |
dev-python/pyparsing[${PYTHON_USEDEP}] |
| 102 |
- " |
| 103 |
- |
| 104 |
-#test phase curently disabled, waiting on upstream to include |
| 105 |
-#the required files: |
| 106 |
-#https://github.com/carlos-jenkins/pydotplus/issues/12 |
| 107 |
-#python_test() { |
| 108 |
-# ${EPYTHON} -m unittest discover || die |
| 109 |
-# tox |
| 110 |
-#} |
| 111 |
+ media-gfx/graphviz |
| 112 |
+" |
| 113 |
+DEPEND="test? ( ${RDEPEND} )" |
| 114 |
+ |
| 115 |
+PATCHES=( "${FILESDIR}/${P}-tests.patch" ) |
| 116 |
+ |
| 117 |
+python_test() { |
| 118 |
+ pushd test > /dev/null || die |
| 119 |
+ python pydot_unittest.py || die |
| 120 |
+ popd > /dev/null || die |
| 121 |
+} |
| 122 |
|
| 123 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 124 |
index 6a6adf308d8..f6552bb6703 100644 |
| 125 |
--- a/profiles/package.mask |
| 126 |
+++ b/profiles/package.mask |
| 127 |
@@ -293,7 +293,6 @@ dev-python/jplephem |
| 128 |
dev-python/natgrid |
| 129 |
dev-python/pcapy |
| 130 |
dev-python/promises |
| 131 |
-dev-python/pydotplus |
| 132 |
dev-python/pyds9 |
| 133 |
dev-python/pyflann |
| 134 |
dev-python/pygsl |
Archives