commit: f1b3b14513457e59edf53d9a715e8ad92484a1c2
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 20 10:06:14 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 20 10:06:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f1b3b145
dev-python/trimesh: version bump, bump py targets
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
dev-python/trimesh/trimesh-3.6.13.ebuild | 57 ----------------------
...{trimesh-3.5.14.ebuild => trimesh-3.9.1.ebuild} | 19 +++-----
2 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/dev-python/trimesh/trimesh-3.6.13.ebuild
b/dev-python/trimesh/trimesh-3.6.13.ebuild
deleted file mode 100644
index 464973430..000000000
--- a/dev-python/trimesh/trimesh-3.6.13.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for loading and using triangular meshes."
-HOMEPAGE="https://trimsh.org/";
-SRC_URI="https://github.com/mikedh/trimesh/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test extra"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- )
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
-"
-RDEPEND="
- extra? (
- dev-libs/xxhash
- dev-python/colorlog[${PYTHON_USEDEP}]
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/networkx[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pyglet[${PYTHON_USEDEP}]
- dev-python/pycollada[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/svg-path[${PYTHON_USEDEP}]
- dev-python/sympy[${PYTHON_USEDEP}]
- sci-libs/scikit-image[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
- sci-libs/shapely[${PYTHON_USEDEP}]
- sci-libs/rtree[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- if use extra; then
- pytest -vv || die
- else
- cd tests || die
- pytest -p no:warnings $(grep -v '^#' basic.list) || die
- fi
-}
diff --git a/dev-python/trimesh/trimesh-3.5.14.ebuild
b/dev-python/trimesh/trimesh-3.9.1.ebuild
similarity index 83%
rename from dev-python/trimesh/trimesh-3.5.14.ebuild
rename to dev-python/trimesh/trimesh-3.9.1.ebuild
index 464973430..d1dc5a9ae 100644
--- a/dev-python/trimesh/trimesh-3.5.14.ebuild
+++ b/dev-python/trimesh/trimesh-3.9.1.ebuild
@@ -1,9 +1,10 @@
-# 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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -14,17 +15,9 @@
SRC_URI="https://github.com/mikedh/trimesh/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test extra"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- )
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
-"
+IUSE="extra"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
RDEPEND="
extra? (
dev-libs/xxhash
@@ -47,6 +40,8 @@ RDEPEND="
)
"
+distutils_enable_tests pytest
+
python_test() {
if use extra; then
pytest -vv || die
