[gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes-props/

[Andrew Ammerlaan]

commit:     22ddf83357181f3e4eefb2044537b4733a392b8c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 15:08:14 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 15:08:14 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=22ddf833

sci-visualization/fsleyes-props: bump to 1.7.3

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

 .../fsleyes-props/fsleyes-props-1.6.7.ebuild       | 46 ----------------------
 ...ops-1.7.0.ebuild => fsleyes-props-1.7.3.ebuild} | 22 +++++------
 2 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild b/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild
deleted file mode 100644
index d9983906e..000000000
--- a/sci-visualization/fsleyes-props/fsleyes-props-1.6.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx
-
-MY_PN="props"
-
-DESCRIPTION="Object attribute management for the FSLeyes viewer"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master"
-SRC_URI="https://git.fmrib.ox.ac.uk/fsl/fsleyes/${MY_PN}/-/archive/${PV}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
-	dev-python/fslpy[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/fsleyes-props-1.6.7-coverage.patch"
-	"${FILESDIR}/fsleyes-props-1.6.7-tests.patch"
-)
-
-python_test() {
-	virtx pytest --verbose || die
-}

diff --git a/sci-visualization/fsleyes-props/fsleyes-props-1.7.0.ebuild b/sci-visualization/fsleyes-props/fsleyes-props-1.7.3.ebuild
similarity index 68%
rename from sci-visualization/fsleyes-props/fsleyes-props-1.7.0.ebuild
rename to sci-visualization/fsleyes-props/fsleyes-props-1.7.3.ebuild
index ea8a11c42..b3440c6ba 100644
--- a/sci-visualization/fsleyes-props/fsleyes-props-1.7.0.ebuild
+++ b/sci-visualization/fsleyes-props/fsleyes-props-1.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 virtualx
 
@@ -12,24 +12,22 @@ MY_PN="props"
 DESCRIPTION="Object attribute management for the FSLeyes viewer"
 HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master"
 SRC_URI="https://git.fmrib.ox.ac.uk/fsl/fsleyes/${MY_PN}/-/archive/${PV}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	sci-visualization/fsleyes-widgets[${PYTHON_USEDEP}]
-	dev-python/fslpy[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+	>=dev-python/wxpython-3.0.2.0[${PYTHON_USEDEP}]
+	>=sci-visualization/fsleyes-widgets-0.6[${PYTHON_USEDEP}]
+	>=dev-python/fslpy-1.4[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	# do not depend on pytest-cov
@@ -39,5 +37,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	virtx pytest --verbose || die
+	virtx epytest
 }