Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/fslpy/, dev-python/fslpy/files/
Date: Fri, 25 Sep 2020 09:04:12
Message-Id: 1601024640.90b79d1f96b83bd39dda48bc0d9a099f2352f09f.chymera@gentoo
1 commit: 90b79d1f96b83bd39dda48bc0d9a099f2352f09f
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Fri Sep 25 09:04:00 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Fri Sep 25 09:04:00 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=90b79d1f
7
8 dev-python/fslpy: removed old version, PYTHON_COMPAT update
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 .../fslpy/files/fslpy-2.6.2-exclude_tests.patch | 10 -----
14 dev-python/fslpy/fslpy-2.6.2.ebuild | 43 ----------------------
15 dev-python/fslpy/fslpy-2.7.0.ebuild | 2 +-
16 dev-python/fslpy/fslpy-2.8.4.ebuild | 2 +-
17 4 files changed, 2 insertions(+), 55 deletions(-)
18
19 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
20 deleted file mode 100644
21 index 503cd5332..000000000
22 --- a/dev-python/fslpy/files/fslpy-2.6.2-exclude_tests.patch
23 +++ /dev/null
24 @@ -1,10 +0,0 @@
25 ---- a/setup.py 2019-11-04 18:56:47.407791008 +0100
26 -+++ b/setup.py 2019-11-04 20:00:24.844224851 +0100
27 -@@ -29,6 +29,6 @@
28 -
29 - packages = find_packages(
30 -- exclude=('doc', 'tests', 'dist', 'build', 'fslpy.egg-info'))
31 -+ exclude=('doc', 'tests', 'tests.*', 'dist', 'build', 'fslpy.egg-info'))
32 -
33 - # Figure out the current fslpy version, as defined in fsl/version.py. We
34 - # don't want to import the fsl package, as this may cause build problems.
35
36 diff --git a/dev-python/fslpy/fslpy-2.6.2.ebuild b/dev-python/fslpy/fslpy-2.6.2.ebuild
37 deleted file mode 100644
38 index 34cbc1c9d..000000000
39 --- a/dev-python/fslpy/fslpy-2.6.2.ebuild
40 +++ /dev/null
41 @@ -1,43 +0,0 @@
42 -# Copyright 1999-2019 Gentoo Authors
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=7
46 -
47 -PYTHON_COMPAT=( python3_{5,6} )
48 -
49 -inherit distutils-r1 virtualx
50 -
51 -DESCRIPTION="The FSL Python Library"
52 -HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fslpy"
53 -SRC_URI="https://github.com/pauldmccarthy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
54 -
55 -LICENSE="BSD"
56 -SLOT="0"
57 -KEYWORDS="~amd64 ~x86"
58 -IUSE="test"
59 -
60 -DEPEND="
61 - test? (
62 - dev-python/pytest[${PYTHON_USEDEP}]
63 - dev-python/pytest-cov[${PYTHON_USEDEP}]
64 - )
65 - dev-python/setuptools[${PYTHON_USEDEP}]
66 -"
67 -RDEPEND="
68 - dev-python/deprecation[${PYTHON_USEDEP}]
69 - dev-python/h5py[${PYTHON_USEDEP}]
70 - dev-python/indexed_gzip[${PYTHON_USEDEP}]
71 - =dev-python/numpy-1*[${PYTHON_USEDEP}]
72 - =dev-python/six-1*[${PYTHON_USEDEP}]
73 - dev-python/trimesh[${PYTHON_USEDEP}]
74 - =dev-python/wxpython-4*[${PYTHON_USEDEP}]
75 - =sci-libs/Rtree-0.8.3*[${PYTHON_USEDEP}]
76 - dev-python/scipy[${PYTHON_USEDEP}]
77 - >=sci-libs/nibabel-2.3.1[${PYTHON_USEDEP}]
78 -"
79 -
80 -PATCHES=( "${FILESDIR}/${P}-exclude_tests.patch" )
81 -
82 -python_test() {
83 - virtx pytest -m "not (dicomtest or fsltest)" --verbose || die
84 -}
85
86 diff --git a/dev-python/fslpy/fslpy-2.7.0.ebuild b/dev-python/fslpy/fslpy-2.7.0.ebuild
87 index 2ed17d59e..67a1deaec 100644
88 --- a/dev-python/fslpy/fslpy-2.7.0.ebuild
89 +++ b/dev-python/fslpy/fslpy-2.7.0.ebuild
90 @@ -3,7 +3,7 @@
91
92 EAPI=7
93
94 -PYTHON_COMPAT=( python3_6 )
95 +PYTHON_COMPAT=( python3_7 )
96
97 inherit distutils-r1 virtualx
98
99
100 diff --git a/dev-python/fslpy/fslpy-2.8.4.ebuild b/dev-python/fslpy/fslpy-2.8.4.ebuild
101 index 797a83c84..67a1deaec 100644
102 --- a/dev-python/fslpy/fslpy-2.8.4.ebuild
103 +++ b/dev-python/fslpy/fslpy-2.8.4.ebuild
104 @@ -3,7 +3,7 @@
105
106 EAPI=7
107
108 -PYTHON_COMPAT=( python3_6 python3_7 )
109 +PYTHON_COMPAT=( python3_7 )
110
111 inherit distutils-r1 virtualx