[gentoo-commits] proj/sci:master commit in: dev-python/meshpy/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     338608f333c20a5980dc0caef9d062b6f09dbdb9
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 17:27:19 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 17:27:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=338608f3

dev-python/meshpy: bump to 2020.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/meshpy/meshpy-2018.2.1_p1.ebuild        | 51 ----------------------
 ...meshpy-2018.2.1.ebuild => meshpy-2020.1.ebuild} | 24 ++++------
 2 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/dev-python/meshpy/meshpy-2018.2.1_p1.ebuild b/dev-python/meshpy/meshpy-2018.2.1_p1.ebuild
deleted file mode 100644
index 6985305a0..000000000
--- a/dev-python/meshpy/meshpy-2018.2.1_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1
-
-MY_PN="MeshPy"
-
-DESCRIPTION="Quality triangular and tetrahedral mesh generation for Python"
-HOMEPAGE="https://mathema.tician.de/software/meshpy
-	https://pypi.python.org/pypi/MeshPy
-"
-
-COMMIT=6f4f9418f5f02b414d561bd8de710c4f1349ea72
-SRC_URI="https://github.com/inducer/meshpy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/boost[python,${PYTHON_USEDEP}]
-	dev-python/gmsh_interop[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/pytools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/gmsh
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed 's:delay=10:delay=1:g' -i aksetup_helper.py || die
-
-#	echo "BOOST_PYTHON_LIBNAME = ['boost_${EPYTHON}-mt']">> "${S}"/siteconf.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}

diff --git a/dev-python/meshpy/meshpy-2018.2.1.ebuild b/dev-python/meshpy/meshpy-2020.1.ebuild
similarity index 70%
rename from dev-python/meshpy/meshpy-2018.2.1.ebuild
rename to dev-python/meshpy/meshpy-2020.1.ebuild
index 5df9336ad..191589690 100644
--- a/dev-python/meshpy/meshpy-2018.2.1.ebuild
+++ b/dev-python/meshpy/meshpy-2020.1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
+MY_PN="MeshPy"
+
 DESCRIPTION="Quality triangular and tetrahedral mesh generation for Python"
 HOMEPAGE="https://mathema.tician.de/software/meshpy
 	https://pypi.python.org/pypi/MeshPy
 "
-
 SRC_URI="https://github.com/inducer/meshpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
+
+# ModuleNotFoundError: No module named 'meshpy._internals'
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/boost[python,${PYTHON_USEDEP}]
@@ -26,22 +29,13 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pytools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/gmsh
 "
 DEPEND="${RDEPEND}"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 
 python_prepare_all() {
 	sed 's:delay=10:delay=1:g' -i aksetup_helper.py || die
-
-#	echo "BOOST_PYTHON_LIBNAME = ['boost_${EPYTHON}-mt']">> "${S}"/siteconf.py
-
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}