* [gentoo-commits] repo/gentoo:master commit in: sci-libs/Shapely/files/, sci-libs/Shapely/
@ 2019-12-02 10:54 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-12-02 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 34b1aa05146bd185d62d6335883b89f1d4309d39
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 10:52:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 2 10:54:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b1aa05
sci-libs/Shapely: Fix testfailure
Patch taken from Debian.
Closes: https://bugs.gentoo.org/701624
Package-Manager: Portage-2.3.80, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/Shapely/Shapely-1.6.4_p2.ebuild | 3 +++
.../files/Shapely-1.6.4_p2-test_operations.patch | 17 +++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
index 111341b34ff..107d9d9c717 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
@@ -31,6 +31,9 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
+
S="${WORKDIR}/${PN}-${MY_PV}"
python_prepare_all() {
diff --git a/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
new file mode 100644
index 00000000000..a9213a33376
--- /dev/null
+++ b/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
@@ -0,0 +1,17 @@
+Description: Mark test_operations as xfail.
+ # Intersection
+ > self.assertIsInstance(point.intersection(Point(-1, -1)),
+ GeometryCollection)
+ E AssertionError: <shapely.geometry.point.Point object at 0xffffb6e2c250> is not an instance of <class 'shapely.geometry.collection.GeometryCollection'>
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/tests/test_operations.py
++++ b/tests/test_operations.py
+@@ -7,6 +7,7 @@ from shapely.geos import TopologicalErro
+
+ class OperationsTestCase(unittest.TestCase):
+
++ @pytest.mark.xfail(reason="Intersection: Point is not an instance of GeometryCollection")
+ def test_operations(self):
+ point = Point(0.0, 0.0)
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/Shapely/files/, sci-libs/Shapely/
@ 2019-12-29 8:53 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2019-12-29 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 9775c9b0099272ca62b7cdf062b2902c96dd873e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 08:53:13 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 08:53:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9775c9b0
sci-libs/Shapely: Remove old
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/Shapely/Manifest | 2 --
sci-libs/Shapely/Shapely-1.3.0.ebuild | 29 ----------------
sci-libs/Shapely/Shapely-1.3.2.ebuild | 29 ----------------
sci-libs/Shapely/Shapely-1.5.17.ebuild | 33 ------------------
sci-libs/Shapely/Shapely-1.6.4_p2.ebuild | 54 ------------------------------
sci-libs/Shapely/files/setup_unicode.patch | 23 -------------
6 files changed, 170 deletions(-)
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index ab1a676fbf8..b64bd533a44 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,4 +1,2 @@
-DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82
-DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d
DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d
DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
deleted file mode 100644
index 4ea83ff68b9..00000000000
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +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="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.1"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/setup_unicode.patch )
-
-python_test() {
- esetup.py test
-}
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
deleted file mode 100644
index 4ea83ff68b9..00000000000
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ /dev/null
@@ -1,29 +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="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.1"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/setup_unicode.patch )
-
-python_test() {
- esetup.py test
-}
diff --git a/sci-libs/Shapely/Shapely-1.5.17.ebuild b/sci-libs/Shapely/Shapely-1.5.17.ebuild
deleted file mode 100644
index a6993a3d6fc..00000000000
--- a/sci-libs/Shapely/Shapely-1.5.17.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.1"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- esetup.py test
-}
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
deleted file mode 100644
index 7b76620b730..00000000000
--- a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sci-libs/geos-3.3
- dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cython[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_prepare_all() {
- # fix install path for Cython definition file
- sed -i \
- -e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
- setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- cd "${TEST_DIR}/lib" || die
- cp -r "${S}/tests" . || die
- py.test tests || die
-}
diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch
deleted file mode 100644
index 89e1b058f0f..00000000000
--- a/sci-libs/Shapely/files/setup_unicode.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- setup.py.orig 2014-06-20 10:27:26.638779565 +0200
-+++ setup.py 2014-06-20 10:27:29.885446151 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-
- from __future__ import print_function
-
-@@ -74,8 +75,12 @@
- readme_text = fp.read()
- readme_text = readme_text.replace(".. include:: CREDITS.txt", "")
-
--with open('CREDITS.txt', 'r') as fp:
-- credits = fp.read()
-+if sys.version_info[0] == 3:
-+ with open('CREDITS.txt', 'r', encoding='utf-8') as fp:
-+ credits = fp.read()
-+elif sys.version_info[0] == 2:
-+ with open('CREDITS.txt', 'r') as fp:
-+ credits = fp.read().decode('utf-8')
-
- with open('CHANGES.txt', 'r') as fp:
- changes_text = fp.read()
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/shapely/files/, sci-libs/shapely/
@ 2020-11-30 18:47 Dennis Lamm
0 siblings, 0 replies; 4+ messages in thread
From: Dennis Lamm @ 2020-11-30 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 55a17758608de9e682f47716efa2ee0bab6c71f9
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 20:40:32 2020 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 18:47:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55a17758
sci-libs/shapely: drop old
Signed-off-by: Dennis Lamm <expeditoneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18451
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
sci-libs/shapely/Manifest | 2 -
.../files/shapely-1.6.4_p2-test_operations.patch | 17 -------
sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild | 57 ----------------------
sci-libs/shapely/shapely-1.7.0.ebuild | 39 ---------------
4 files changed, 115 deletions(-)
diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest
index 0ef111bb11b..2848f35bb31 100644
--- a/sci-libs/shapely/Manifest
+++ b/sci-libs/shapely/Manifest
@@ -1,3 +1 @@
-DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
-DIST shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
diff --git a/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch b/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
deleted file mode 100644
index a9213a33376..00000000000
--- a/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Mark test_operations as xfail.
- # Intersection
- > self.assertIsInstance(point.intersection(Point(-1, -1)),
- GeometryCollection)
- E AssertionError: <shapely.geometry.point.Point object at 0xffffb6e2c250> is not an instance of <class 'shapely.geometry.collection.GeometryCollection'>
-Author: Bas Couwenberg <sebastic@debian.org>
-
---- a/tests/test_operations.py
-+++ b/tests/test_operations.py
-@@ -7,6 +7,7 @@ from shapely.geos import TopologicalErro
-
- class OperationsTestCase(unittest.TestCase):
-
-+ @pytest.mark.xfail(reason="Intersection: Point is not an instance of GeometryCollection")
- def test_operations(self):
- point = Point(0.0, 0.0)
-
diff --git a/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
deleted file mode 100644
index be793427c4b..00000000000
--- a/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Shapely"
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
-MY_P="${MY_PN}-${MY_PV}"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/Toblerity/${MY_PN}.git"
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/geos-3.3"
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # fix install path for Cython definition file
- sed -i \
- -e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
- setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing
- cd "${TEST_DIR}/lib" || die
- cp -r "${S}/tests" . || die
- py.test tests || die
-}
diff --git a/sci-libs/shapely/shapely-1.7.0.ebuild b/sci-libs/shapely/shapely-1.7.0.ebuild
deleted file mode 100644
index 3e2d10095ce..00000000000
--- a/sci-libs/shapely/shapely-1.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Shapely"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
-SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/geos-3.3
-"
-
-BDEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/matplotlib
-
-python_test() {
- distutils_install_for_testing
- ${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/shapely/files/, sci-libs/shapely/
@ 2021-03-06 16:11 Dennis Lamm
0 siblings, 0 replies; 4+ messages in thread
From: Dennis Lamm @ 2021-03-06 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 613d5f55baee5c296a3a51ca5af023c7f11215da
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 15:44:32 2021 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 16:11:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613d5f55
sci-libs/shapely: fixed failing tests with geos 3.9
Related Upsteam Issue: https://github.com/Toblerity/Shapely/issues/1079
Bug: https://bugs.gentoo.org/765745
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19797
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
.../shapely-1.7.1-tests-support-geos-3.9.patch | 61 ++++++++++++++++++++++
sci-libs/shapely/shapely-1.7.1-r1.ebuild | 41 +++++++++++++++
2 files changed, 102 insertions(+)
diff --git a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
new file mode 100644
index 00000000000..18b6c5ad9a4
--- /dev/null
+++ b/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
@@ -0,0 +1,61 @@
+diff --git a/tests/test_svg.py b/tests/test_svg.py
+--- a/tests/test_svg.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/tests/test_svg.py (date 1615044742785)
+@@ -174,7 +174,8 @@
+ self.assertSVG(GeometryCollection(), '<g />')
+ # Valid
+ self.assertSVG(
+- Point(7, 3).union(LineString([(4, 2), (8, 4)])),
++ GeometryCollection(
++ [Point(7, 3), LineString([(4, 2), (8, 4)])]),
+ '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" '
+ 'stroke-width="1.0" fill="#66cc99" opacity="0.6" />'
+ '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" '
+--- a/tests/test_wkb.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/tests/test_wkb.py (date 1615044817079)
+@@ -1,6 +1,11 @@
++import binascii
++
++import pytest
++
++from shapely import wkt
+ from shapely.wkb import dumps, loads
+ from shapely.geometry import Point
+-import binascii
++from shapely.geos import geos_version
+
+
+ def bin2hex(value):
+@@ -49,3 +54,20 @@
+ # replace geometry srid with another
+ result = dumps(geom, srid=27700)
+ assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40"
++
++
++requires_geos_39 = pytest.mark.xfail(
++ geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True)
++
++
++@requires_geos_39
++def test_point_empty():
++ g = wkt.loads("POINT EMPTY")
++ assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F"
++
++
++@requires_geos_39
++def test_point_z_empty():
++ g = wkt.loads("POINT Z EMPTY")
++ assert g.wkb_hex == \
++ "0101000080000000000000F87F000000000000F87F000000000000F87F"
+diff --git a/shapely/geos.py b/shapely/geos.py
+--- a/shapely/geos.py (revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/shapely/geos.py (date 1615044673942)
+@@ -84,7 +84,7 @@
+ 'libgeos_c.so.1',
+ 'libgeos_c.so',
+ ]
+- _lgeos = load_dll('geos_c', fallbacks=alt_paths)
++ _lgeos = load_dll('libgeos_c', fallbacks=alt_paths)
+ # Necessary for environments with only libc.musl
+ c_alt_paths = [
+ 'libc.musl-x86_64.so.1'
diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
new file mode 100644
index 00000000000..6bb1493675c
--- /dev/null
+++ b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Shapely"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
+SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=sci-libs/geos-3.9
+"
+
+BDEPEND="${RDEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-tests-support-geos-3.9.patch" )
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/matplotlib
+
+python_test() {
+ distutils_install_for_testing
+ ${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-06 16:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-30 18:47 [gentoo-commits] repo/gentoo:master commit in: sci-libs/shapely/files/, sci-libs/shapely/ Dennis Lamm
-- strict thread matches above, loose matches on Subject: below --
2021-03-06 16:11 Dennis Lamm
2019-12-29 8:53 [gentoo-commits] repo/gentoo:master commit in: sci-libs/Shapely/files/, sci-libs/Shapely/ David Seifert
2019-12-02 10:54 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox