Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/fsleyes-widgets/files/, sci-visualization/fsleyes-widgets/
Date: Sun, 19 Jan 2020 15:23:49
Message-Id: 1579447214.cc082a637bcbb6c289216b62cfaacb24212557b5.chymera@gentoo
1 commit: cc082a637bcbb6c289216b62cfaacb24212557b5
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Sun Jan 19 15:20:14 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Sun Jan 19 15:20:14 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=cc082a63
7
8 sci-visualization/fsleyes-widgets: new package, required for FSLeyes
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 sci-visualization/fsleyes-widgets/ChangeLog | 7 +++
14 .../files/fsleyes-widgets-0.8.4-coverage.patch | 10 ++++
15 .../files/fsleyes-widgets-0.8.4-tests.patch | 69 ++++++++++++++++++++++
16 .../fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild | 47 +++++++++++++++
17 sci-visualization/fsleyes-widgets/metadata.xml | 18 ++++++
18 5 files changed, 151 insertions(+)
19
20 diff --git a/sci-visualization/fsleyes-widgets/ChangeLog b/sci-visualization/fsleyes-widgets/ChangeLog
21 new file mode 100644
22 index 000000000..14d95538a
23 --- /dev/null
24 +++ b/sci-visualization/fsleyes-widgets/ChangeLog
25 @@ -0,0 +1,7 @@
26 +*fsleyes-widgets-0.8.4 (16 Jan 2020)
27 +
28 + 16 Jan 2020; <chymera@g.o>
29 + +files/fsleyes-widgets-0.8.4-coverage.patch,
30 + +files/fsleyes-widgets-0.8.4-tests.patch, +fsleyes-widgets-0.8.4.ebuild,
31 + +metadata.xml, -fsleyes-widgets-0.6.5.ebuild, -manifest.xml:
32 + sci-visualization/fsleyes-widgets: version bump 0.8.4 ahead of Gentoo Science
33
34 diff --git a/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-coverage.patch b/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-coverage.patch
35 new file mode 100644
36 index 000000000..6db8c01d8
37 --- /dev/null
38 +++ b/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-coverage.patch
39 @@ -0,0 +1,10 @@
40 +diff --git a/setup.cfg b/setup.cfg
41 +index c3ebd936..d678d2df 100644
42 +--- a/setup.cfg
43 ++++ b/setup.cfg
44 +@@ -9,4 +9,4 @@ ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701
45 +
46 + [tool:pytest]
47 + testpaths = tests
48 +-addopts = -v --cov=fsleyes_widgets
49 ++addopts = -v
50
51 diff --git a/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-tests.patch b/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-tests.patch
52 new file mode 100644
53 index 000000000..20ef1a9ad
54 --- /dev/null
55 +++ b/sci-visualization/fsleyes-widgets/files/fsleyes-widgets-0.8.4-tests.patch
56 @@ -0,0 +1,69 @@
57 +diff --git a/tests/test_floatslider.py b/tests/test_floatslider.py
58 +index 87a2477..6bbedb7 100644
59 +--- a/tests/test_floatslider.py
60 ++++ b/tests/test_floatslider.py
61 +@@ -140,8 +140,14 @@ def _test_FloatSlider_changeRange():
62 + _test_widget_changeRange(slider)
63 +
64 +
65 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
66 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
67 ++ )
68 + def test_FloatSlider_mouse_non_gtk():
69 + run_with_wx(_test_FloatSlider_mouse)
70 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
71 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
72 ++ )
73 + def test_FloatSlider_mouse_gtk():
74 + with mock.patch('fsleyes_widgets.floatslider.wx.Platform', '__WXGTK__'):
75 + run_with_wx(_test_FloatSlider_mouse)
76 +@@ -322,7 +328,9 @@ def _test_SliderSpinPanel_show_edit_limits():
77 + if shouldEv: assert result[0] == expected
78 + else: assert result[0] is None
79 +
80 +-
81 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
82 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
83 ++ )
84 + def test_SliderSpinPanel_events():
85 + run_with_wx(_test_SliderSpinPanel_events)
86 + def _test_SliderSpinPanel_events():
87 +diff --git a/tests/test_notebook.py b/tests/test_notebook.py
88 +index a02226c..74e8f63 100644
89 +--- a/tests/test_notebook.py
90 ++++ b/tests/test_notebook.py
91 +@@ -190,6 +190,9 @@ def _test_enable_disable_show_hide(side, ornt):
92 + assert notebook.GetSelection() == 1
93 +
94 +
95 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
96 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
97 ++ )
98 + def test_event():
99 + nb_run_with_wx(_test_event)
100 + def _test_event(side, ornt):
101 +diff --git a/tests/test_rangeslider.py b/tests/test_rangeslider.py
102 +index 7ddbed6..51267b3 100644
103 +--- a/tests/test_rangeslider.py
104 ++++ b/tests/test_rangeslider.py
105 +@@ -103,6 +103,9 @@ def _test_RangePanel_logic_spin():
106 + _test_RangePanel_logic(panel)
107 +
108 +
109 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
110 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
111 ++ )
112 + def test_RangePanel_events_slider():
113 + run_with_wx(_test_RangePanel_events_slider)
114 + def _test_RangePanel_events_slider():
115 +@@ -236,6 +239,9 @@ def _test_RangeSliderSpinPanel_logic():
116 + _test_RangePanel_logic(panel)
117 +
118 +
119 ++@×××××××××××.skip(reason="Known to fail on Gentoo:"
120 ++ "https://github.com/pauldmccarthy/fsleyes-widgets/issues/1"
121 ++ )
122 + def test_RangeSliderSpinPanel_onchange():
123 + run_with_wx(_test_RangeSliderSpinPanel_onchange)
124 + def _test_RangeSliderSpinPanel_onchange():
125 +
126
127 diff --git a/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
128 new file mode 100644
129 index 000000000..b9766ca40
130 --- /dev/null
131 +++ b/sci-visualization/fsleyes-widgets/fsleyes-widgets-0.8.4.ebuild
132 @@ -0,0 +1,47 @@
133 +# Copyright 1999-2020 Gentoo Authors
134 +# Distributed under the terms of the GNU General Public License v2
135 +
136 +EAPI=7
137 +
138 +PYTHON_COMPAT=( python3_{6,7} )
139 +
140 +inherit distutils-r1 virtualx
141 +
142 +MY_P="widgets-${PV}"
143 +
144 +DESCRIPTION="The new FSL image viewer, first released with FSL 5.0.10"
145 +HOMEPAGE="https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/tree/master"
146 +SRC_URI="https://git.fmrib.ox.ac.uk/fsl/fsleyes/widgets/-/archive/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
147 +
148 +LICENSE="BSD"
149 +SLOT="0"
150 +KEYWORDS="~amd64 ~x86"
151 +IUSE="test"
152 +
153 +DEPEND="
154 + test? (
155 + dev-python/pytest[${PYTHON_USEDEP}]
156 + )
157 + dev-python/setuptools[${PYTHON_USEDEP}]
158 + "
159 +RDEPEND="
160 + dev-python/deprecation[${PYTHON_USEDEP}]
161 + =dev-python/numpy-1*[${PYTHON_USEDEP}]
162 + dev-python/matplotlib[${PYTHON_USEDEP}]
163 + =dev-python/six-1*[${PYTHON_USEDEP}]
164 + dev-python/wxpython[${PYTHON_USEDEP}]
165 + "
166 +
167 +S="${WORKDIR}/${MY_P}"
168 +
169 +PATCHES=(
170 + "${FILESDIR}/fsleyes-widgets-0.8.4-coverage.patch"
171 + "${FILESDIR}/fsleyes-widgets-0.8.4-tests.patch"
172 +)
173 +
174 +python_test() {
175 + # If this could be set for the eclass, it might fix some of the tests:
176 + # https://github.com/pauldmccarthy/fsleyes-widgets/issues/1#issuecomment-575387724
177 + #xvfbargs="-screen 0 1920x1200x24 +extension RANDR"
178 + virtx pytest --verbose || die
179 +}
180
181 diff --git a/sci-visualization/fsleyes-widgets/metadata.xml b/sci-visualization/fsleyes-widgets/metadata.xml
182 new file mode 100644
183 index 000000000..153c0c611
184 --- /dev/null
185 +++ b/sci-visualization/fsleyes-widgets/metadata.xml
186 @@ -0,0 +1,18 @@
187 +<?xml version='1.0' encoding='UTF-8'?>
188 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
189 +<pkgmetadata>
190 + <maintainer type="person">
191 + <email>chr@×××××××.eu</email>
192 + <name>Horea Christian</name>
193 + </maintainer>
194 + <maintainer type="project">
195 + <email>sci@g.o</email>
196 + <name>Gentoo Science Project</name>
197 + </maintainer>
198 + <longdescription lang="en">
199 + FSLeyes is a viewer for 3D and 4D neuroimaging data. It is intended as a
200 + replacement for the much loved FSLView. FSLeyes offers similar functionality
201 + to FSLView, and aims to improve and expand upon this functionality in many
202 + ways.
203 + </longdescription>
204 +</pkgmetadata>