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

[Andrew Ammerlaan]

commit:     43df0040d2daeed6edd9ea6a4f4e4038483d87b6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 15:07:37 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 15:07:37 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=43df0040

sci-visualization/fsleyes-widgets: bump to 0.12.2

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

 ...-0.9.0.ebuild => fsleyes-widgets-0.12.2.ebuild} | 20 +++++----
 .../fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild   | 47 ----------------------
 2 files changed, 9 insertions(+), 58 deletions(-)

diff --git a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.9.0.ebuild b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.12.2.ebuild
similarity index 82%
rename from sci-visualization/fsleyes-widgets/fsleyes-widgets-0.9.0.ebuild
rename to sci-visualization/fsleyes-widgets/fsleyes-widgets-0.12.2.ebuild
index 4e00e2e47..82a1e587c 100644
--- a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.9.0.ebuild
+++ b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.12.2.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,22 +12,20 @@ MY_P="widgets-${PV}"
 DESCRIPTION="GUI widgets and utilities 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/widgets/-/archive/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
 	=dev-python/numpy-1*[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	=dev-python/six-1*[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${MY_P}"
+	>=dev-python/matplotlib-1.5[${PYTHON_USEDEP}]
+	>=dev-python/wxpython-3.0.2.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
 
 python_prepare_all() {
 	# do not depend on pytest-cov
@@ -55,5 +53,5 @@ python_test() {
 	# If this could be set for the eclass, it might fix some of the tests:
 	# https://github.com/pauldmccarthy/fsleyes-widgets/issues/1#issuecomment-575387724
 	#xvfbargs="-screen 0 1920x1200x24 +extension RANDR"
-	virtx pytest --verbose || die
+	virtx epytest
 }

diff --git a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
deleted file mode 100644
index cbae95701..000000000
--- a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
+++ /dev/null
@@ -1,47 +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_P="widgets-${PV}"
-
-DESCRIPTION="GUI widgets and utilities 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/widgets/-/archive/${PV}/${MY_P}.tar.gz -> ${P}.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-1*[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	=dev-python/six-1*[${PYTHON_USEDEP}]
-	dev-python/wxpython[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/fsleyes-widgets-0.8.4-coverage.patch"
-	"${FILESDIR}/fsleyes-widgets-0.8.4-tests.patch"
-)
-
-python_test() {
-	# If this could be set for the eclass, it might fix some of the tests:
-	# https://github.com/pauldmccarthy/fsleyes-widgets/issues/1#issuecomment-575387724
-	#xvfbargs="-screen 0 1920x1200x24 +extension RANDR"
-	virtx pytest --verbose || die
-}