* [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/
@ 2019-11-07 1:51 Horea Christian
0 siblings, 0 replies; 4+ messages in thread
From: Horea Christian @ 2019-11-07 1:51 UTC (permalink / raw
To: gentoo-commits
commit: a89157a16ae4e45837bcd4ac865c242d2ca32423
Author: Horea Christian <horea.christ <AT> yandex <DOT> com>
AuthorDate: Thu Nov 7 01:51:27 2019 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Thu Nov 7 01:51:27 2019 +0000
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 <horea.christ <AT> 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 000000000..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 000000000..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 000000000..1e458f838
--- /dev/null
+++ b/dev-python/fslpy/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>horea.christ@gmail.com</email>
+ <name>Horea Christian</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ 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.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/
@ 2020-01-17 17:20 Horea Christian
0 siblings, 0 replies; 4+ messages in thread
From: Horea Christian @ 2020-01-17 17:20 UTC (permalink / raw
To: gentoo-commits
commit: e52836962f2b74e9e6dfadaeece3007993a0c3f5
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Jan 17 17:20:48 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Jan 17 17:20:48 2020 +0000
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 <chr <AT> 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 000000000..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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/
@ 2020-09-25 9:04 Horea Christian
0 siblings, 0 replies; 4+ messages in thread
From: Horea Christian @ 2020-09-25 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 90b79d1f96b83bd39dda48bc0d9a099f2352f09f
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Sep 25 09:04:00 2020 +0000
Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Fri Sep 25 09:04:00 2020 +0000
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 <chr <AT> 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..000000000
--- 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..000000000
--- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/
@ 2022-01-24 16:06 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-01-24 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5832f19544c11516d20b6efe56f82a4cb9b71b51
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 16:05:39 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 16:05:39 2022 +0000
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 <andrewammerlaan <AT> 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..000000000
--- 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..000000000
--- 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..000000000
--- 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}]
- !<sci-biology/fsl-6.0.4
-"
-
-DEPEND="
- !<sci-biology/fsl-6.0.4
-"
-
-PATCHES=(
- "${FILESDIR}/fslpy-2.7.0-coverage.patch"
- "${FILESDIR}/fslpy-3-remove_dataclasses_req.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- virtx pytest --niters=50 -m "not (dicomtest or longtest or fsltest)" --verbose || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-24 16:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-25 9:04 [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/ Horea Christian
-- strict thread matches above, loose matches on Subject: below --
2022-01-24 16:06 Andrew Ammerlaan
2020-01-17 17:20 Horea Christian
2019-11-07 1:51 Horea Christian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox