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

2024-09-23 Thread Andrew Ammerlaan 
commit: badbc2d0b3e3c7153733422208b846fb5e7d97ed
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Sep 23 14:18:09 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Sep 23 14:18:09 2024 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=badbc2d0

dev-python/fslpy: rtree was moved

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
index c80db0ac6..bd802ddf4 100644
--- a/dev-python/fslpy/fslpy-3.10.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
>=dev-python/trimesh-2.37.29[${PYTHON_USEDEP}]
=dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   >=sci-libs/rtree-0.8.3[${PYTHON_USEDEP}]
+   >=dev-python/rtree-0.8.3[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.4[${PYTHON_USEDEP}]
>=dev-python/scipy-0.18[${PYTHON_USEDEP}]
 "

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

2024-09-23 Thread Andrew Ammerlaan 
commit: 81b524756063d8ebfc7ef44916147eb713e996ac
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Sep 23 14:17:35 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Sep 23 14:17:35 2024 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=81b52475

dev-python/fslpy: unkeyword 3.10.0 for ~x86

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
index 3f6262707..c80db0ac6 100644
--- a/dev-python/fslpy/fslpy-3.10.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RDEPEND="
dev-python/dill[${PYTHON_USEDEP}]

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

2023-12-31 Thread Andrew Ammerlaan 
commit: c4493c4f5f8486d807e8c26d61ffbeea2c35daf2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Dec 30 17:49:24 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Dec 31 08:50:12 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c4493c4f

dev-python/fslpy: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/fslpy/files/fslpy-2.7.0-coverage.patch | 16 
 1 file changed, 16 deletions(-)

diff --git a/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch 
b/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch
deleted file mode 100644
index 3de6d92f1..0
--- a/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 9ea1ddb..00eb59b 100644
 a/setup.cfg
-+++ b/setup.cfg
-@@ -18,8 +18,8 @@ markers =
- 
- 
- testpaths = tests
--addopts   = -v --niters=50 --cov=fsl -m "not longtest"
-+addopts   = -v --niters=50 -m "not longtest"
- 
- 
- [flake8]
--ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701,W504
-\ No newline at end of file
-+ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701,W504

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

2023-07-26 Thread Alexander Puck Neuwirth 
commit: 9a394899bab9bc34f89a41371cc3bb928bb01e5c
Author: Alexander Puck Neuwirth  neuwirth-informatik  
de>
AuthorDate: Wed Jul 26 22:10:05 2023 +
Commit: Alexander Puck Neuwirth  neuwirth-informatik  
de>
CommitDate: Wed Jul 26 22:10:05 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a394899

dev-python/fslpy: indexed_gzip → indexed-gzip

Signed-off-by: Alexander Puck Neuwirth  neuwirth-informatik.de>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
index 2cc4e60ff..3f6262707 100644
--- a/dev-python/fslpy/fslpy-3.10.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
dev-python/dill[${PYTHON_USEDEP}]
>=dev-python/h5py-2.9[${PYTHON_USEDEP}]
-   >=dev-python/indexed_gzip-0.7.0[${PYTHON_USEDEP}]
+   >=dev-python/indexed-gzip-0.7.0[${PYTHON_USEDEP}]
>=dev-python/numpy-1[${PYTHON_USEDEP}]
>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
>=dev-python/trimesh-2.37.29[${PYTHON_USEDEP}]

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

2023-05-02 Thread Horea Christian 
commit: 83e88172628f0f65cf9a3e292eabb9e61a41d2d9
Author: Horea Christian  chymera  eu>
AuthorDate: Wed May  3 00:14:41 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed May  3 00:14:41 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=83e88172

dev-python/fslpy: enable py3.11

Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
index d25cfb22f..2cc4e60ff 100644
--- a/dev-python/fslpy/fslpy-3.10.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 virtualx

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

2023-02-15 Thread Horea Christian 
commit: 09b8e0bb2871461d03f97ebe9060909df92c38c1
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Feb 16 07:32:56 2023 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Feb 16 07:32:56 2023 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=09b8e0bb

dev-python/fslpy: updated doc package name

Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
index ce3b7008f..d25cfb22f 100644
--- a/dev-python/fslpy/fslpy-3.10.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+distutils_enable_sphinx doc dev-python/sphinx-rtd-theme
 
 python_prepare_all() {
# Do not depend on coverage

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

2022-10-11 Thread Andrew Ammerlaan 
commit: 281623980215a99afd89a378548b50ac99af3a00
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Oct 11 19:17:08 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Oct 11 19:17:08 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=28162398

dev-python/fslpy: drop 3.8.1

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/fslpy/fslpy-3.8.1.ebuild | 43 -
 1 file changed, 43 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.8.1.ebuild 
b/dev-python/fslpy/fslpy-3.8.1.ebuild
deleted file mode 100644
index f28e7283e..0
--- a/dev-python/fslpy/fslpy-3.8.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="The FSL Python Library"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   >=dev-python/h5py-2.9[${PYTHON_USEDEP}]
-   >=dev-python/indexed_gzip-0.7.0[${PYTHON_USEDEP}]
-   >=dev-python/numpy-1[${PYTHON_USEDEP}]
-   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-   >=dev-python/trimesh-2.37.29[${PYTHON_USEDEP}]
-   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   >=sci-libs/rtree-0.8.3[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.4[${PYTHON_USEDEP}]
-   >=dev-python/scipy-0.18[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-   "${FILESDIR}/fslpy-2.7.0-coverage.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-
-src_test() {
-   virtx distutils-r1_src_test
-}
-
-python_test() {
-   epytest --niters=50 -m "not (dicomtest or longtest or fsltest)" || die 
"Tests failed with ${EPYTHON}"
-}

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

2022-10-11 Thread Andrew Ammerlaan 
commit: 6df21099f76d9c9f49670a3bf61b12fc0edb4762
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Oct 11 19:01:12 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Oct 11 19:01:12 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6df21099

dev-python/fslpy: add 3.10.0

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-python/fslpy/fslpy-3.10.0.ebuild | 47 
 1 file changed, 47 insertions(+)

diff --git a/dev-python/fslpy/fslpy-3.10.0.ebuild 
b/dev-python/fslpy/fslpy-3.10.0.ebuild
new file mode 100644
index 0..7140be033
--- /dev/null
+++ b/dev-python/fslpy/fslpy-3.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The FSL Python Library"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
+SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   dev-python/dill[${PYTHON_USEDEP}]
+   >=dev-python/h5py-2.9[${PYTHON_USEDEP}]
+   >=dev-python/indexed_gzip-0.7.0[${PYTHON_USEDEP}]
+   >=dev-python/numpy-1[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/trimesh-2.37.29[${PYTHON_USEDEP}]
+   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
+   >=sci-libs/rtree-0.8.3[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.4[${PYTHON_USEDEP}]
+   >=dev-python/scipy-0.18[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+   # Do not depend on coverage
+   sed -i -e 's/--cov=fsl//g' setup.cfg || die
+
+   distutils-r1_python_prepare_all
+}
+
+src_test() {
+   virtx distutils-r1_src_test
+}
+
+python_test() {
+   epytest -m "not (dicomtest or longtest or fsltest)" || die "Tests 
failed with ${EPYTHON}"
+}

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

2022-07-06 Thread Sam James 
commit: 7dda52b599b1e71d4aaeb7d1f2541769d855efbf
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  7 04:34:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  7 04:54:10 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7dda52b5

dev-python/fslpy: enable py3.10

See 
https://projects.gentoo.org/python/guide/distutils.html#running-tests-with-virtualx
 re virtx.

Signed-off-by: Sam James  gentoo.org>

 dev-python/fslpy/fslpy-3.8.1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.8.1.ebuild 
b/dev-python/fslpy/fslpy-3.8.1.ebuild
index 5bff5ed60..f28e7283e 100644
--- a/dev-python/fslpy/fslpy-3.8.1.ebuild
+++ b/dev-python/fslpy/fslpy-3.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
@@ -34,6 +34,10 @@ PATCHES=(
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
 
+src_test() {
+   virtx distutils-r1_src_test
+}
+
 python_test() {
-   virtx epytest --niters=50 -m "not (dicomtest or longtest or fsltest)"
+   epytest --niters=50 -m "not (dicomtest or longtest or fsltest)" || die 
"Tests failed with ${EPYTHON}"
 }

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/

2022-01-24 Thread Andrew Ammerlaan 
commit: 5832f19544c11516d20b6efe56f82a4cb9b71b51
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jan 24 16:05:39 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jan 24 16:05:39 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5832f195

dev-python/fslpy: cleanup old

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

 .../files/fslpy-3-remove_dataclasses_req.patch |  8 
 dev-python/fslpy/fslpy-2.8.4.ebuild| 42 
 dev-python/fslpy/fslpy-3.4.0.ebuild| 46 --
 3 files changed, 96 deletions(-)

diff --git a/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch 
b/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch
deleted file mode 100644
index eb2a0480d..0
--- a/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Naur fslpy-3.4.0.orig/requirements.txt fslpy-3.4.0/requirements.txt
 fslpy-3.4.0.orig/requirements.txt  2021-02-18 21:38:49.826829560 -0500
-+++ fslpy-3.4.0/requirements.txt   2021-02-18 21:38:55.475829863 -0500
-@@ -3,4 +3,3 @@
- numpy>=1
- scipy>=0.18
- six>=1
--dataclasses

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
deleted file mode 100644
index ed427ded2..0
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ /dev/null
@@ -1,42 +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
-
-DESCRIPTION="The FSL Python Library"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.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/h5py[${PYTHON_USEDEP}]
-   dev-python/indexed_gzip[${PYTHON_USEDEP}]
-   =dev-python/numpy-1*[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
-   =dev-python/six-1*[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   sci-libs/rtree[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
-
-python_test() {
-   virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" 
--verbose || die
-}

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
deleted file mode 100644
index 59e17f0cf..0
--- a/dev-python/fslpy/fslpy-3.4.0.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..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="The FSL Python Library"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-python/h5py[${PYTHON_USEDEP}]
-   dev-python/indexed_gzip[${PYTHON_USEDEP}]
-   =dev-python/numpy-1*[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
-   =dev-python/six-1*[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   sci-libs/rtree[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   !

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

2022-01-23 Thread Andrew Ammerlaan 
commit: e05b66d92b5b4beda76e6755eb982c336c1a9ff6
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Jan 23 13:06:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jan 23 13:06:24 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e05b66d9

dev-python/fslpy: drop redundant uri rename

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

 dev-python/fslpy/fslpy-3.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.8.1.ebuild 
b/dev-python/fslpy/fslpy-3.8.1.ebuild
index 092f36094..5bff5ed60 100644
--- a/dev-python/fslpy/fslpy-3.8.1.ebuild
+++ b/dev-python/fslpy/fslpy-3.8.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx
 
 DESCRIPTION="The FSL Python Library"
 HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"

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

2022-01-14 Thread Andrew Ammerlaan 
commit: c377e8531bc653276cafbacdf6f41b5e3c53247e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Jan 14 19:34:17 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Jan 14 19:34:17 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c377e853

dev-python/fslpy: add version 3.8.1

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

 dev-python/fslpy/fslpy-3.8.1.ebuild | 39 +
 1 file changed, 39 insertions(+)

diff --git a/dev-python/fslpy/fslpy-3.8.1.ebuild 
b/dev-python/fslpy/fslpy-3.8.1.ebuild
new file mode 100644
index 0..092f36094
--- /dev/null
+++ b/dev-python/fslpy/fslpy-3.8.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The FSL Python Library"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
+SRC_URI="https://git.fmrib.ox.ac.uk/fsl/${PN}/-/archive/${PV}/${P}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   >=dev-python/h5py-2.9[${PYTHON_USEDEP}]
+   >=dev-python/indexed_gzip-0.7.0[${PYTHON_USEDEP}]
+   >=dev-python/numpy-1[${PYTHON_USEDEP}]
+   >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+   >=dev-python/trimesh-2.37.29[${PYTHON_USEDEP}]
+   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
+   >=sci-libs/rtree-0.8.3[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.4[${PYTHON_USEDEP}]
+   >=dev-python/scipy-0.18[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+   "${FILESDIR}/fslpy-2.7.0-coverage.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+python_test() {
+   virtx epytest --niters=50 -m "not (dicomtest or longtest or fsltest)"
+}

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

2021-10-10 Thread Horea Christian 
commit: 882ecf00afb0055275d67f66d0f81fe03c7ff80f
Author: Horea Christian  chymera  eu>
AuthorDate: Sun Oct 10 22:05:26 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Sun Oct 10 22:05:26 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=882ecf00

dev-python/fslpy: package block

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-3.4.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index 5722f21bb..59e17f0cf 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -27,6 +27,11 @@ RDEPEND="
sci-libs/rtree[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
+   !

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

2021-09-30 Thread Horea Christian 
commit: 1b85b9f2161c1d22c57066ceb2ec20e442d39e71
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Sep 30 10:59:03 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Sep 30 10:59:03 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b85b9f2

dev-python/fslpy: PYTHON_COMPAT bump

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-3.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index ebde16303..5722f21bb 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx

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

2021-03-15 Thread Andrew Ammerlaan 
commit: e6042f568b1aa290ffd6f212fcb9255d3ed5f24e
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon Mar 15 08:30:28 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon Mar 15 08:30:28 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e6042f56

dev-python/fslpy: remove trailing whitespace

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 dev-python/fslpy/fslpy-3.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index fc4a2a629..ebde16303 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -29,8 +29,8 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
 "
 
-PATCHES=( 
-   "${FILESDIR}/fslpy-2.7.0-coverage.patch" 
+PATCHES=(
+   "${FILESDIR}/fslpy-2.7.0-coverage.patch"
"${FILESDIR}/fslpy-3-remove_dataclasses_req.patch"
 )

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/files/, dev-python/fslpy/

2021-03-15 Thread Horea Christian 
commit: 0d2c9adbc44295a290232b4fa509beda05ca9101
Author: AbstractMethod  med-image  info>
AuthorDate: Tue Mar  9 05:45:41 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Mar 15 07:53:24 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0d2c9adb

dev-python/fslpy: Changes to resolve file collisions

Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch | 8 
 dev-python/fslpy/fslpy-3.4.0.ebuild | 8 +---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch 
b/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch
new file mode 100644
index 0..eb2a0480d
--- /dev/null
+++ b/dev-python/fslpy/files/fslpy-3-remove_dataclasses_req.patch
@@ -0,0 +1,8 @@
+diff -Naur fslpy-3.4.0.orig/requirements.txt fslpy-3.4.0/requirements.txt
+--- fslpy-3.4.0.orig/requirements.txt  2021-02-18 21:38:49.826829560 -0500
 fslpy-3.4.0/requirements.txt   2021-02-18 21:38:55.475829863 -0500
+@@ -3,4 +3,3 @@
+ numpy>=1
+ scipy>=0.18
+ six>=1
+-dataclasses

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index ee8dcf336..fc4a2a629 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -14,8 +14,7 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-# Fails with file collisions with =sci-biology/fsl-6.0.2-r1
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]
@@ -30,7 +29,10 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
+PATCHES=( 
+   "${FILESDIR}/fslpy-2.7.0-coverage.patch" 
+   "${FILESDIR}/fslpy-3-remove_dataclasses_req.patch"
+)
 
 distutils_enable_tests pytest

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

2021-01-31 Thread Horea Christian 
commit: 309efaaf039e3b7f2502cc079450f46c66ed1678
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Feb  1 01:26:09 2021 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Feb  1 01:26:31 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=309efaaf

dev-python/fslpy: partly revert f70ee4b8e441a7a03d4440c9672aef88664b6e81

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/{fslpy-3.4.0.ebuild => fslpy-2.8.4.ebuild} | 10 +++---
 dev-python/fslpy/fslpy-3.4.0.ebuild |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
similarity index 89%
copy from dev-python/fslpy/fslpy-3.4.0.ebuild
copy to dev-python/fslpy/fslpy-2.8.4.ebuild
index a01f84ab8..ed427ded2 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
 
@@ -15,7 +14,14 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+"
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]
dev-python/indexed_gzip[${PYTHON_USEDEP}]
@@ -31,8 +37,6 @@ RDEPEND="
 
 PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
 
-distutils_enable_tests pytest
-
 python_test() {
virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" 
--verbose || die
 }

diff --git a/dev-python/fslpy/fslpy-3.4.0.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
index a01f84ab8..ee8dcf336 100644
--- a/dev-python/fslpy/fslpy-3.4.0.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.ebuild
@@ -14,7 +14,8 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+# Fails with file collisions with =sci-biology/fsl-6.0.2-r1
+KEYWORDS=""
 
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]

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

2021-01-20 Thread Andrew Ammerlaan 
commit: f70ee4b8e441a7a03d4440c9672aef88664b6e81
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Wed Jan 20 10:30:06 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Jan 20 10:30:06 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f70ee4b8

dev-python/fslpy: version bump. bump py targets

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 dev-python/fslpy/{fslpy-2.8.4.ebuild => fslpy-3.4.0.ebuild} | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-3.4.0.ebuild
similarity index 85%
rename from dev-python/fslpy/fslpy-2.8.4.ebuild
rename to dev-python/fslpy/fslpy-3.4.0.ebuild
index 572f1aae1..a01f84ab8 100644
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ b/dev-python/fslpy/fslpy-3.4.0.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 virtualx
 
@@ -14,14 +15,7 @@ 
SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-DEPEND="
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   )
-   dev-python/setuptools[${PYTHON_USEDEP}]
-"
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]
dev-python/indexed_gzip[${PYTHON_USEDEP}]
@@ -37,6 +31,8 @@ RDEPEND="
 
 PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
 
+distutils_enable_tests pytest
+
 python_test() {
virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" 
--verbose || die
 }

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

2020-12-23 Thread Horea Christian 
commit: 640611ad2498cdaf2ee16eb967f252de7260c9e7
Author: Horea Christian  chymera  eu>
AuthorDate: Wed Dec 23 08:37:57 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Wed Dec 23 08:37:57 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=640611ad

dev-python/fslpy: updated PYTHON_COMPAT

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
index ece0c42a1..572f1aae1 100644
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1 virtualx

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

2020-10-21 Thread Horea Christian 
commit: d58c5fa2f30d59fe9a87c9d42893cb15407a7067
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Oct 22 06:10:05 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Oct 22 06:10:05 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=d58c5fa2

dev-python/fslpy: fixed test phase

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
index 3b08dd1f6..ece0c42a1 100644
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -38,5 +38,5 @@ RDEPEND="
 PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
 
 python_test() {
-   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
+   virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" 
--verbose || die
 }

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

2020-10-21 Thread Horea Christian 
commit: e52cbb4975c77496b0815230c31d27b101afa95c
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Oct 22 06:11:17 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Oct 22 06:11:17 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e52cbb49

dev-python/fslpy: dropped old version with broken tests

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.7.0.ebuild | 42 -
 1 file changed, 42 deletions(-)

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
deleted file mode 100644
index 3b08dd1f6..0
--- a/dev-python/fslpy/fslpy-2.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="The FSL Python Library"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.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/h5py[${PYTHON_USEDEP}]
-   dev-python/indexed_gzip[${PYTHON_USEDEP}]
-   =dev-python/numpy-1*[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
-   =dev-python/six-1*[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   sci-libs/rtree[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
-
-python_test() {
-   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
-}

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

2020-10-19 Thread Horea Christian 
commit: caa403b23b69d17b132590cefd88b965e106129e
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Oct 19 21:55:09 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Oct 19 21:55:09 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=caa403b2

dev-python/fslpy: updated rtree dependency following rename

As per:
https://gitweb.gentoo.org/repo/gentoo.git/commit/profiles/arch.list?id=ead3dbad2e9beb6bc3ecde96730c931beb79ebb5

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.7.0.ebuild | 2 +-
 dev-python/fslpy/fslpy-2.8.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
index 67a1deaec..3b08dd1f6 100644
--- a/dev-python/fslpy/fslpy-2.7.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
=dev-python/six-1*[${PYTHON_USEDEP}]
dev-python/trimesh[${PYTHON_USEDEP}]
=dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
+   sci-libs/rtree[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
 "

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
index 67a1deaec..3b08dd1f6 100644
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
=dev-python/six-1*[${PYTHON_USEDEP}]
dev-python/trimesh[${PYTHON_USEDEP}]
=dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
+   sci-libs/rtree[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
dev-python/scipy[${PYTHON_USEDEP}]
 "

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/

2020-09-25 Thread Horea Christian 
commit: 90b79d1f96b83bd39dda48bc0d9a099f2352f09f
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Sep 25 09:04:00 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Sep 25 09:04:00 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=90b79d1f

dev-python/fslpy: removed old version, PYTHON_COMPAT update

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian  chymera.eu>

 .../fslpy/files/fslpy-2.6.2-exclude_tests.patch| 10 -
 dev-python/fslpy/fslpy-2.6.2.ebuild| 43 --
 dev-python/fslpy/fslpy-2.7.0.ebuild|  2 +-
 dev-python/fslpy/fslpy-2.8.4.ebuild|  2 +-
 4 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch 
b/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch
deleted file mode 100644
index 503cd5332..0
--- a/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/setup.py 2019-11-04 18:56:47.407791008 +0100
-+++ b/setup.py 2019-11-04 20:00:24.844224851 +0100
-@@ -29,6 +29,6 @@
- 
- packages = find_packages(
--exclude=('doc', 'tests', 'dist', 'build', 'fslpy.egg-info'))
-+exclude=('doc', 'tests', 'tests.*', 'dist', 'build', 'fslpy.egg-info'))
- 
- # Figure out the current fslpy version, as defined in fsl/version.py. We
- # don't want to import the fsl package,  as this may cause build problems.

diff --git a/dev-python/fslpy/fslpy-2.6.2.ebuild 
b/dev-python/fslpy/fslpy-2.6.2.ebuild
deleted file mode 100644
index 34cbc1c9d..0
--- a/dev-python/fslpy/fslpy-2.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="The FSL Python Library"
-HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
-SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-   test? (
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/pytest-cov[${PYTHON_USEDEP}]
-   )
-   dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   dev-python/deprecation[${PYTHON_USEDEP}]
-   dev-python/h5py[${PYTHON_USEDEP}]
-   dev-python/indexed_gzip[${PYTHON_USEDEP}]
-   =dev-python/numpy-1*[${PYTHON_USEDEP}]
-   =dev-python/six-1*[${PYTHON_USEDEP}]
-   dev-python/trimesh[${PYTHON_USEDEP}]
-   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
-   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${P}-exclude_tests.patch" )
-
-python_test() {
-   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
-}

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
index 2ed17d59e..67a1deaec 100644
--- a/dev-python/fslpy/fslpy-2.7.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1 virtualx
 

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
index 797a83c84..67a1deaec 100644
--- a/dev-python/fslpy/fslpy-2.8.4.ebuild
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1 virtualx

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

2020-03-16 Thread Horea Christian 
commit: e2934ce98d0fc312cdc6dc54da3f62446b8522d1
Author: Horea Christian  chymera  eu>
AuthorDate: Mon Mar 16 20:05:31 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Mon Mar 16 20:05:31 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e2934ce9

dev-python/fslpy: version bump 2.8.4

and PYTHON_COMPAT upgrade to 3.7

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.8.4.ebuild | 42 +
 1 file changed, 42 insertions(+)

diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild 
b/dev-python/fslpy/fslpy-2.8.4.ebuild
new file mode 100644
index 0..0d5764e43
--- /dev/null
+++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The FSL Python Library"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
+SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.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/h5py[${PYTHON_USEDEP}]
+   dev-python/indexed_gzip[${PYTHON_USEDEP}]
+   =dev-python/numpy-1*[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   =dev-python/six-1*[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
+   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
+
+python_test() {
+   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
+}

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/

2020-01-17 Thread Horea Christian 
commit: e52836962f2b74e9e6dfadaeece3007993a0c3f5
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Jan 17 17:20:48 2020 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Jan 17 17:20:48 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e5283696

dev-python/fslpy: removed deprecated test dep

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/files/fslpy-2.7.0-coverage.patch | 16 
 dev-python/fslpy/fslpy-2.7.0.ebuild   |  7 ---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch 
b/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch
new file mode 100644
index 0..3de6d92f1
--- /dev/null
+++ b/dev-python/fslpy/files/fslpy-2.7.0-coverage.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.cfg b/setup.cfg
+index 9ea1ddb..00eb59b 100644
+--- a/setup.cfg
 b/setup.cfg
+@@ -18,8 +18,8 @@ markers =
+ 
+ 
+ testpaths = tests
+-addopts   = -v --niters=50 --cov=fsl -m "not longtest"
++addopts   = -v --niters=50 -m "not longtest"
+ 
+ 
+ [flake8]
+-ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701,W504
+\ No newline at end of file
++ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701,W504

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
index 211ae6087..bb7a5032b 100644
--- a/dev-python/fslpy/fslpy-2.7.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 virtualx
 
@@ -19,7 +19,6 @@ IUSE="test"
 DEPEND="
test? (
dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/pytest-cov[${PYTHON_USEDEP}]
)
dev-python/setuptools[${PYTHON_USEDEP}]
 "
@@ -36,6 +35,8 @@ RDEPEND="
sci-libs/scipy[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/fslpy-2.7.0-coverage.patch" )
+
 python_test() {
virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
 }

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

2019-11-07 Thread Horea Christian 
commit: 9a4a50f96873b278d957248e4512ed64b52f7deb
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Nov  8 06:23:53 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Nov  8 06:25:21 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9a4a50f9

dev-python/fslpy: corrected indenting

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.6.2.ebuild | 4 ++--
 dev-python/fslpy/fslpy-2.7.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-python/fslpy/fslpy-2.6.2.ebuild 
b/dev-python/fslpy/fslpy-2.6.2.ebuild
index 31ea40ece..389ab8d42 100644
--- a/dev-python/fslpy/fslpy-2.6.2.ebuild
+++ b/dev-python/fslpy/fslpy-2.6.2.ebuild
@@ -22,7 +22,7 @@ DEPEND="
dev-python/pytest-cov[${PYTHON_USEDEP}]
)
dev-python/setuptools[${PYTHON_USEDEP}]
-   "
+"
 RDEPEND="
dev-python/deprecation[${PYTHON_USEDEP}]
dev-python/h5py[${PYTHON_USEDEP}]
@@ -34,7 +34,7 @@ RDEPEND="
=sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
-   "
+"
 
 PATCHES=( "${FILESDIR}/${P}-exclude_tests.patch" )
 

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
index a61c8b6d7..211ae6087 100644
--- a/dev-python/fslpy/fslpy-2.7.0.ebuild
+++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
dev-python/pytest-cov[${PYTHON_USEDEP}]
)
dev-python/setuptools[${PYTHON_USEDEP}]
-   "
+"
 RDEPEND="
dev-python/h5py[${PYTHON_USEDEP}]
dev-python/indexed_gzip[${PYTHON_USEDEP}]
@@ -34,7 +34,7 @@ RDEPEND="
=sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
>=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
-   "
+"
 
 python_test() {
virtx pytest -m "not (dicomtest or fsltest)" --verbose || die

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

2019-11-07 Thread Horea Christian 
commit: 6f5e0a4c6026962a3e4b2aef3df2e20ea231b4e5
Author: Horea Christian  chymera  eu>
AuthorDate: Fri Nov  8 06:16:09 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Fri Nov  8 06:17:39 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f5e0a4c

dev-python/fslpy: version bump 2.7.0

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Horea Christian  chymera.eu>

 dev-python/fslpy/fslpy-2.7.0.ebuild | 41 +
 dev-python/fslpy/metadata.xml   |  8 
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild 
b/dev-python/fslpy/fslpy-2.7.0.ebuild
new file mode 100644
index 0..a61c8b6d7
--- /dev/null
+++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The FSL Python Library"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
+SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-cov[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/h5py[${PYTHON_USEDEP}]
+   dev-python/indexed_gzip[${PYTHON_USEDEP}]
+   =dev-python/numpy-1*[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   =dev-python/six-1*[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
+   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   "
+
+python_test() {
+   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
+}

diff --git a/dev-python/fslpy/metadata.xml b/dev-python/fslpy/metadata.xml
index 1e458f838..ebf08fddf 100644
--- a/dev-python/fslpy/metadata.xml
+++ b/dev-python/fslpy/metadata.xml
@@ -10,9 +10,9 @@
Gentoo Science Project


-   FSLeyes is a viewer for 3D and 4D neuroimaging data. It is 
intended as a
-   replacement for the much loved FSLView. FSLeyes offers similar 
functionality
-   to FSLView, and aims to improve and expand upon this 
functionality in many
-   ways.
+   The fslpy project is an FSL programming library written (for 
the processing
+   of neuroimaging data) in Python. It is used by the FSLeyes 
visualization
+   packag visualization
+   package.

[gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/

2019-11-06 Thread Horea Christian 
commit: a89157a16ae4e45837bcd4ac865c242d2ca32423
Author: Horea Christian  yandex  com>
AuthorDate: Thu Nov  7 01:51:27 2019 +
Commit: Horea Christian  gmail  com>
CommitDate: Thu Nov  7 01:51:27 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a89157a1

dev-python/fslpy: package from newly modular FSL stack

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Horea Christian  yandex.com>

 .../fslpy/files/fslpy-2.6.2-exclude_tests.patch| 10 +
 dev-python/fslpy/fslpy-2.6.2.ebuild| 43 ++
 dev-python/fslpy/metadata.xml  | 18 +
 3 files changed, 71 insertions(+)

diff --git a/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch 
b/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch
new file mode 100644
index 0..503cd5332
--- /dev/null
+++ b/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch
@@ -0,0 +1,10 @@
+--- a/setup.py 2019-11-04 18:56:47.407791008 +0100
 b/setup.py 2019-11-04 20:00:24.844224851 +0100
+@@ -29,6 +29,6 @@
+ 
+ packages = find_packages(
+-exclude=('doc', 'tests', 'dist', 'build', 'fslpy.egg-info'))
++exclude=('doc', 'tests', 'tests.*', 'dist', 'build', 'fslpy.egg-info'))
+ 
+ # Figure out the current fslpy version, as defined in fsl/version.py. We
+ # don't want to import the fsl package,  as this may cause build problems.

diff --git a/dev-python/fslpy/fslpy-2.6.2.ebuild 
b/dev-python/fslpy/fslpy-2.6.2.ebuild
new file mode 100644
index 0..31ea40ece
--- /dev/null
+++ b/dev-python/fslpy/fslpy-2.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The FSL Python Library"
+HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy";
+SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+   test? (
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/pytest-cov[${PYTHON_USEDEP}]
+   )
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   "
+RDEPEND="
+   dev-python/deprecation[${PYTHON_USEDEP}]
+   dev-python/h5py[${PYTHON_USEDEP}]
+   dev-python/indexed_gzip[${PYTHON_USEDEP}]
+   =dev-python/numpy-1*[${PYTHON_USEDEP}]
+   =dev-python/six-1*[${PYTHON_USEDEP}]
+   dev-python/trimesh[${PYTHON_USEDEP}]
+   =dev-python/wxpython-4*[${PYTHON_USEDEP}]
+   =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
+   "
+
+PATCHES=( "${FILESDIR}/${P}-exclude_tests.patch" )
+
+python_test() {
+   virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
+}

diff --git a/dev-python/fslpy/metadata.xml b/dev-python/fslpy/metadata.xml
new file mode 100644
index 0..1e458f838
--- /dev/null
+++ b/dev-python/fslpy/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   horea.chr...@gmail.com
+   Horea Christian
+   
+   
+   s...@gentoo.org
+   Gentoo Science Project
+   
+   
+   FSLeyes is a viewer for 3D and 4D neuroimaging data. It is 
intended as a
+   replacement for the much loved FSLView. FSLeyes offers similar 
functionality
+   to FSLView, and aims to improve and expand upon this 
functionality in many
+   ways.
+   
+