Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/montage-wrapper/files/, dev-python/montage-wrapper/
Date: Sat, 28 Dec 2019 16:53:41
Message-Id: 1577552008.477c5477112b780ada0fc3bb37d8a6a0ffb48977.zlogene@gentoo
1 commit: 477c5477112b780ada0fc3bb37d8a6a0ffb48977
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 16:53:28 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 16:53:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477c5477
7
8 dev-python/montage-wrapper: remove last-rited pkg
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 dev-python/montage-wrapper/Manifest | 2 -
13 .../files/montage-wrapper-0.9.8-fix_tests.patch | 40 -----------------
14 .../montage-wrapper-0.9.8-increase_rtol.patch | 17 --------
15 .../montage-wrapper-0.9.8-use_configparser.patch | 18 --------
16 dev-python/montage-wrapper/metadata.xml | 17 --------
17 .../montage-wrapper/montage-wrapper-0.9.8.ebuild | 51 ----------------------
18 .../montage-wrapper/montage-wrapper-0.9.9.ebuild | 43 ------------------
19 7 files changed, 188 deletions(-)
20
21 diff --git a/dev-python/montage-wrapper/Manifest b/dev-python/montage-wrapper/Manifest
22 deleted file mode 100644
23 index 374877e0733..00000000000
24 --- a/dev-python/montage-wrapper/Manifest
25 +++ /dev/null
26 @@ -1,2 +0,0 @@
27 -DIST montage-wrapper-0.9.8.tar.gz 208240 BLAKE2B 697eb310207cdf760f1d2ae23a840717817e85ff118886d475c73787aed4a4b644f5ab70d551686a4a746af001321846af76b9c7911ddd24943d30bd5afa128e SHA512 a9aeb48f86d055448fdfed3a5c3762b554627db10f1374cbd3f7af6002721ae04e9f47828c2084147be40f79c1c4ce6e56568bf61a6cdd78a31ce91de6365ec1
28 -DIST montage-wrapper-0.9.9.tar.gz 187490 BLAKE2B 1c7f06e1c168a96b574ce7a65c99aad9482a523b0c6288e8686410fdd4c9102a27cf098ab5e56895888e17147f20d8c5eb0c8785527543757b6a4166a409e4e0 SHA512 a113a9f1ca03ca158ed6d8a4520c6710804a5ac10bae3dd0c0231390f771479c43f0cdd08e302c59ac1d608c4865d4b0d7a3a233ad068d40d3f1c0efbc343533
29
30 diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
31 deleted file mode 100644
32 index 8d611b72f81..00000000000
33 --- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-fix_tests.patch
34 +++ /dev/null
35 @@ -1,40 +0,0 @@
36 -Author: Ole Streicher <olebole@××××××.org>
37 -Description: Make sure that opened FITS files are closed after the test
38 ---- a/montage_wrapper/tests/test_wrappers.py
39 -+++ b/montage_wrapper/tests/test_wrappers.py
40 -@@ -46,21 +46,21 @@
41 -
42 - def test_mosaic(self):
43 - mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic'), hdu=0)
44 -- hdu = fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits'))[0]
45 -- assert hdu.data.shape == (288, 282)
46 -- valid = hdu.data[~np.isnan(hdu.data)]
47 -- assert len(valid) == 65029
48 -- assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
49 -- assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
50 -- assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
51 -+ with fits.open(os.path.join(self.tmpdir, 'mosaic', 'mosaic.fits')) as hdu:
52 -+ assert hdu[0].data.shape == (288, 282)
53 -+ valid = hdu[0].data[~np.isnan(hdu[0].data)]
54 -+ assert len(valid) == 65029
55 -+ assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
56 -+ assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
57 -+ assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
58 -
59 - @pytest.mark.xfail() # results are not consistent on different machines
60 - def test_mosaic_background_match(self):
61 - mosaic(os.path.join(self.tmpdir, 'raw'),os.path.join(self.tmpdir, 'mosaic_bkgmatch'), background_match=True)
62 -- hdu = fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits'))[0]
63 -- assert hdu.data.shape == (288, 282)
64 -- valid = hdu.data[~np.isnan(hdu.data)]
65 -- assert len(valid) == 65029
66 -- assert_allclose(np.std(valid), 0.12661606622654725)
67 -- assert_allclose(np.mean(valid), 0.4994805202294361)
68 -- assert_allclose(np.median(valid), 0.5002447366714478)
69 -+ with fits.open(os.path.join(self.tmpdir, 'mosaic_bkgmatch', 'mosaic.fits')) as hdu:
70 -+ assert hdu[0].data.shape == (288, 282)
71 -+ valid = hdu[0].data[~np.isnan(hdu[0].data)]
72 -+ assert len(valid) == 65029
73 -+ assert_allclose(np.std(valid), 0.12661606622654725)
74 -+ assert_allclose(np.mean(valid), 0.4994805202294361)
75 -+ assert_allclose(np.median(valid), 0.5002447366714478)
76
77 diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
78 deleted file mode 100644
79 index 285b525a4df..00000000000
80 --- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-increase_rtol.patch
81 +++ /dev/null
82 @@ -1,17 +0,0 @@
83 -Author: Ole Streicher <olebole@××××××.org>
84 -Description: Increase rtol of asserts to let the tests succeed with montage-4.0
85 ---- a/montage_wrapper/tests/test_wrappers.py
86 -+++ b/montage_wrapper/tests/test_wrappers.py
87 -@@ -50,9 +50,9 @@
88 - assert hdu.data.shape == (288, 282)
89 - valid = hdu.data[~np.isnan(hdu.data)]
90 - assert len(valid) == 65029
91 -- assert_allclose(np.std(valid), 0.12658458001333581)
92 -- assert_allclose(np.mean(valid), 0.4995945318627074)
93 -- assert_allclose(np.median(valid), 0.5003376603126526)
94 -+ assert_allclose(np.std(valid), 0.12658458001333581, 1e-5)
95 -+ assert_allclose(np.mean(valid), 0.4995945318627074, 1e-5)
96 -+ assert_allclose(np.median(valid), 0.5003376603126526, 1e-5)
97 -
98 - @pytest.mark.xfail() # results are not consistent on different machines
99 - def test_mosaic_background_match(self):
100
101 diff --git a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch b/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
102 deleted file mode 100644
103 index 082c3678e12..00000000000
104 --- a/dev-python/montage-wrapper/files/montage-wrapper-0.9.8-use_configparser.patch
105 +++ /dev/null
106 @@ -1,18 +0,0 @@
107 -Author: Vincent Prat <vinceprat@××××.fr>
108 -Description: Use ConfigParser module instead of the one embedded in distutils.config
109 ---- a/setup.py
110 -+++ b/setup.py
111 -@@ -21,8 +21,11 @@
112 - from astropy_helpers.version_helpers import generate_version_py
113 -
114 - # Get some values from the setup.cfg
115 --from distutils import config
116 --conf = config.ConfigParser()
117 -+try:
118 -+ from configparser import ConfigParser
119 -+except:
120 -+ from ConfigParser import ConfigParser
121 -+conf = ConfigParser()
122 - conf.read(['setup.cfg'])
123 - metadata = dict(conf.items('metadata'))
124 -
125
126 diff --git a/dev-python/montage-wrapper/metadata.xml b/dev-python/montage-wrapper/metadata.xml
127 deleted file mode 100644
128 index aa3e481c13e..00000000000
129 --- a/dev-python/montage-wrapper/metadata.xml
130 +++ /dev/null
131 @@ -1,17 +0,0 @@
132 -<?xml version="1.0" encoding="UTF-8"?>
133 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
134 -<pkgmetadata>
135 - <maintainer type="project">
136 - <email>sci-astronomy@g.o</email>
137 - <name>Gentoo Astronomy Project</name>
138 - </maintainer>
139 - <longdescription>
140 - This Astropy-affiliated package provides a python wrapper to the
141 - Montage Astronomical Image Mosaic Engine, including both functions to
142 - access individual Montage commands, and high-level functions to
143 - facilitate mosaicking and re-projecting.
144 -</longdescription>
145 - <upstream>
146 - <remote-id type="pypi">montage-wrapper</remote-id>
147 - </upstream>
148 -</pkgmetadata>
149
150 diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
151 deleted file mode 100644
152 index 20c9351818b..00000000000
153 --- a/dev-python/montage-wrapper/montage-wrapper-0.9.8.ebuild
154 +++ /dev/null
155 @@ -1,51 +0,0 @@
156 -# Copyright 1999-2019 Gentoo Authors
157 -# Distributed under the terms of the GNU General Public License v2
158 -
159 -EAPI=6
160 -
161 -PYTHON_COMPAT=( python3_5 )
162 -
163 -inherit distutils-r1
164 -
165 -DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
166 -HOMEPAGE="http://www.astropy.org/montage-wrapper/"
167 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
168 -
169 -LICENSE="BSD"
170 -SLOT="0"
171 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
172 -IUSE="doc test"
173 -RESTRICT="!test? ( test )"
174 -
175 -RDEPEND="
176 - dev-python/astropy[${PYTHON_USEDEP}]
177 - sci-astronomy/montage"
178 -DEPEND="
179 - dev-python/astropy[${PYTHON_USEDEP}]
180 - dev-python/setuptools[${PYTHON_USEDEP}]
181 - test? ( sci-astronomy/montage )"
182 -
183 -PATCHES=(
184 - "${FILESDIR}/${P}-increase_rtol.patch"
185 - "${FILESDIR}/${P}-fix_tests.patch"
186 - "${FILESDIR}/${P}-use_configparser.patch"
187 -)
188 -
189 -python_prepare_all() {
190 - # use system astropy-helpers instead of bundled one
191 - sed -i -e '/auto_use/s/True/False/' setup.cfg || die
192 - distutils-r1_python_prepare_all
193 -}
194 -
195 -python_compile_all() {
196 - use doc && PYTHONPATH=".." emake -C docs html
197 -}
198 -
199 -python_test() {
200 - ${EPYTHON} setup.py test
201 -}
202 -
203 -python_install_all() {
204 - use doc && HTML_DOCS=( docs/_build/html/. )
205 - distutils-r1_python_install_all
206 -}
207
208 diff --git a/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild b/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
209 deleted file mode 100644
210 index 0bbad5312f5..00000000000
211 --- a/dev-python/montage-wrapper/montage-wrapper-0.9.9.ebuild
212 +++ /dev/null
213 @@ -1,43 +0,0 @@
214 -# Copyright 1999-2019 Gentoo Authors
215 -# Distributed under the terms of the GNU General Public License v2
216 -
217 -EAPI=6
218 -
219 -PYTHON_COMPAT=( python3_{5,6} )
220 -
221 -inherit distutils-r1
222 -
223 -DESCRIPTION="Python wrapper for the Montage mosaicking toolkit"
224 -HOMEPAGE="http://www.astropy.org/montage-wrapper/"
225 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
226 -
227 -LICENSE="BSD"
228 -SLOT="0"
229 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
230 -IUSE="doc test"
231 -RESTRICT="!test? ( test )"
232 -
233 -RDEPEND="
234 - dev-python/astropy[${PYTHON_USEDEP}]
235 - sci-astronomy/montage"
236 -DEPEND="
237 - dev-python/astropy[${PYTHON_USEDEP}]
238 - dev-python/setuptools[${PYTHON_USEDEP}]
239 - test? ( sci-astronomy/montage )"
240 -
241 -python_prepare_all() {
242 - # use system astropy-helpers instead of bundled one
243 - sed -i -e '/auto_use/s/True/False/' setup.cfg || die
244 - distutils-r1_python_prepare_all
245 -}
246 -
247 -python_compile_all() {
248 - if use doc; then
249 - PYTHONPATH=".." emake -C docs html
250 - HTML_DOCS=( docs/_build/html/. )
251 - fi
252 -}
253 -
254 -python_test() {
255 - esetup.py test || die "tests failed with ${EPYTHON}"
256 -}