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/spectral-cube/files/, dev-python/spectral-cube/
Date: Sat, 28 Dec 2019 16:41:43
Message-Id: 1577551292.da8a8afb223fe7c8043a5fec0d7f32283917e3a2.zlogene@gentoo
1 commit: da8a8afb223fe7c8043a5fec0d7f32283917e3a2
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 16:41:32 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 16:41:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8a8afb
7
8 dev-python/spectrial-cube: remove last-rited pkg
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 dev-python/spectral-cube/Manifest | 1 -
13 .../files/spectral-cube-0.4.0-looseversion.patch | 139 ---------------------
14 dev-python/spectral-cube/metadata.xml | 19 ---
15 .../spectral-cube/spectral-cube-0.4.0.ebuild | 52 --------
16 4 files changed, 211 deletions(-)
17
18 diff --git a/dev-python/spectral-cube/Manifest b/dev-python/spectral-cube/Manifest
19 deleted file mode 100644
20 index c0717432bc0..00000000000
21 --- a/dev-python/spectral-cube/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST spectral-cube-0.4.0.tar.gz 290453 BLAKE2B 3e41ca0e6d925e36269c638aabc9e4df70ac8abf9ac2a59c4425435bbcb2d0b9b1ec1140e47828d597665a0164dc7c0b88d929762ca5c7bf72b5b16aa31f97d1 SHA512 20970d1be0d836bd07ea96ee909300f28eaf2ab4ded7b4525eb68399d242b864fe93120a16ef2ef35eba5f547c0cbe90b07c27ef44ab1910dbbe97230fbab84e
25
26 diff --git a/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch b/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
27 deleted file mode 100644
28 index 42147de559a..00000000000
29 --- a/dev-python/spectral-cube/files/spectral-cube-0.4.0-looseversion.patch
30 +++ /dev/null
31 @@ -1,139 +0,0 @@
32 -From: Ole Streicher <olebole@××××××.org>
33 -Date: Tue, 12 Jul 2016 08:54:59 +0200
34 -Subject: Use LooseVersion instead of StrictVersion.
35 -
36 -StrictVersion fails on numpy RCs. LooseVersion is a compromise until something better is available.
37 ----
38 - spectral_cube/np_compat.py | 4 ++--
39 - spectral_cube/spectral_cube.py | 4 ++--
40 - spectral_cube/tests/test_masks.py | 4 ++--
41 - spectral_cube/tests/test_moments.py | 4 ++--
42 - spectral_cube/tests/test_spectral_cube.py | 10 +++++-----
43 - 5 files changed, 13 insertions(+), 13 deletions(-)
44 -
45 -diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py
46 -index e72b4d9..dd9080a 100644
47 ---- a/spectral_cube/np_compat.py
48 -+++ b/spectral_cube/np_compat.py
49 -@@ -1,7 +1,7 @@
50 - from __future__ import print_function, absolute_import, division
51 -
52 - import numpy as np
53 --from distutils.version import StrictVersion
54 -+from distutils.version import LooseVersion
55 -
56 - def allbadtonan(function):
57 - """
58 -@@ -11,7 +11,7 @@ def allbadtonan(function):
59 - """
60 - def f(data, axis=None):
61 - result = function(data, axis=axis)
62 -- if StrictVersion(np.__version__) >= StrictVersion('1.9.0'):
63 -+ if LooseVersion(np.__version__) >= LooseVersion('1.9.0'):
64 - if axis is None:
65 - if np.all(np.isnan(data)):
66 - return np.nan
67 -diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py
68 -index 231245d..fa61119 100644
69 ---- a/spectral_cube/spectral_cube.py
70 -+++ b/spectral_cube/spectral_cube.py
71 -@@ -34,7 +34,7 @@ from .lower_dimensional_structures import (Projection, Slice, OneDSpectrum,
72 - LowerDimensionalObject)
73 - from .base_class import BaseNDClass, SpectralAxisMixinClass, DOPPLER_CONVENTIONS
74 -
75 --from distutils.version import StrictVersion
76 -+from distutils.version import LooseVersion
77 -
78 - __all__ = ['SpectralCube', 'VaryingResolutionSpectralCube']
79 -
80 -@@ -2072,7 +2072,7 @@ class BaseSpectralCube(BaseNDClass, SpectralAxisMixinClass):
81 - import yt
82 -
83 - if ('dev' in yt.__version__ or
84 -- StrictVersion(yt.__version__) >= StrictVersion('3.0')):
85 -+ LooseVersion(yt.__version__) >= LooseVersion('3.0')):
86 -
87 - from yt.frontends.fits.api import FITSDataset
88 - from yt.units.unit_object import UnitParseError
89 -diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py
90 -index 9116cb3..42a2125 100644
91 ---- a/spectral_cube/tests/test_masks.py
92 -+++ b/spectral_cube/tests/test_masks.py
93 -@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, SpectralCube, LazyMask, LazyComparisonMask,
94 - FunctionMask, CompositeMask)
95 - from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset
96 -
97 --from distutils.version import StrictVersion
98 -+from distutils.version import LooseVersion
99 -
100 -
101 - def test_spectral_cube_mask():
102 -@@ -370,7 +370,7 @@ def test_flat_mask():
103 - assert np.all(cube.sum(axis=0)[mask_array] == mcube.sum(axis=0)[mask_array])
104 - assert np.all(np.isnan(mcube.sum(axis=0)[~mask_array]))
105 -
106 --@×××××××××××.skipif(StrictVersion(np.__version__) < StrictVersion('1.7'),
107 -+@×××××××××××.skipif(LooseVersion(np.__version__) < LooseVersion('1.7'),
108 - reason='Numpy <1.7 does not support multi-slice indexing.')
109 - def test_flat_mask_spectral():
110 - cube, data = cube_and_raw('adv.fits')
111 -diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py
112 -index 9b118fd..82eff40 100644
113 ---- a/spectral_cube/tests/test_moments.py
114 -+++ b/spectral_cube/tests/test_moments.py
115 -@@ -1,7 +1,7 @@
116 - from __future__ import print_function, absolute_import, division
117 -
118 - import warnings
119 --from distutils.version import StrictVersion
120 -+from distutils.version import LooseVersion
121 -
122 - import pytest
123 - import numpy as np
124 -@@ -78,7 +78,7 @@ axis_order = pytest.mark.parametrize(('axis', 'order'),
125 - (1, 0), (1, 1), (1, 2),
126 - (2, 0), (2, 1), (2, 2)))
127 -
128 --if StrictVersion(astropy.__version__[:3]) >= StrictVersion('1.0'):
129 -+if LooseVersion(astropy.__version__[:3]) >= LooseVersion('1.0'):
130 - # The relative error is slightly larger on astropy-dev
131 - # There is no obvious reason for this.
132 - rtol = 2e-7
133 -diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py
134 -index 025e6bd..4dce3bb 100644
135 ---- a/spectral_cube/tests/test_spectral_cube.py
136 -+++ b/spectral_cube/tests/test_spectral_cube.py
137 -@@ -4,7 +4,7 @@ import operator
138 - import itertools
139 - import warnings
140 - import mmap
141 --from distutils.version import StrictVersion, LooseVersion
142 -+from distutils.version import LooseVersion, LooseVersion
143 -
144 - # needed to test for warnings later
145 - warnings.simplefilter('always', UserWarning)
146 -@@ -468,12 +468,12 @@ class TestNumpyMethods(BaseTest):
147 - scmed = self.c.apply_numpy_function(np.median, axis=0)
148 - # this checks whether numpy <=1.9.3 has a bug?
149 - # as far as I can tell, np==1.9.3 no longer has this bug/feature
150 -- #if StrictVersion(np.__version__) <= StrictVersion('1.9.3'):
151 -+ #if LooseVersion(np.__version__) <= LooseVersion('1.9.3'):
152 - # # print statements added so we get more info in the travis builds
153 -- # print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
154 -+ # print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
155 - # assert np.count_nonzero(np.isnan(scmed)) == 5
156 - #else:
157 -- # print("Numpy version is: {0}".format(StrictVersion(np.__version__)))
158 -+ # print("Numpy version is: {0}".format(LooseVersion(np.__version__)))
159 - assert np.count_nonzero(np.isnan(scmed)) == 6
160 -
161 - scmed = self.c.apply_numpy_function(np.nanmedian, axis=0)
162 -@@ -667,7 +667,7 @@ def test_read_write_rountrip(tmpdir):
163 - assert cube.shape == cube.shape
164 - assert_allclose(cube._data, cube2._data)
165 - if (((hasattr(_wcs, '__version__')
166 -- and StrictVersion(_wcs.__version__) < StrictVersion('5.9'))
167 -+ and LooseVersion(_wcs.__version__) < LooseVersion('5.9'))
168 - or not hasattr(_wcs, '__version__'))):
169 - # see https://github.com/astropy/astropy/pull/3992 for reasons:
170 - # we should upgrade this for 5.10 when the absolute accuracy is
171
172 diff --git a/dev-python/spectral-cube/metadata.xml b/dev-python/spectral-cube/metadata.xml
173 deleted file mode 100644
174 index 0cc45ca202a..00000000000
175 --- a/dev-python/spectral-cube/metadata.xml
176 +++ /dev/null
177 @@ -1,19 +0,0 @@
178 -<?xml version="1.0" encoding="UTF-8"?>
179 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
180 -<pkgmetadata>
181 - <maintainer type="project">
182 - <email>sci-astronomy@g.o</email>
183 - <name>Gentoo Astronomy Project</name>
184 - </maintainer>
185 - <longdescription lang="en">
186 - The spectral-cube astronomy python module provides an easy way to
187 - read, manipulate, analyze, and write data cubes with two
188 - positional dimensions and one spectral dimension, optionally with
189 - Stokes parameters. It aims to be a versatile data container for
190 - building custom analysis routines.
191 - </longdescription>
192 - <upstream>
193 - <remote-id type="pypi">spectral-cube</remote-id>
194 - <remote-id type="github">astropy/spectral-cube</remote-id>
195 - </upstream>
196 -</pkgmetadata>
197
198 diff --git a/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild b/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
199 deleted file mode 100644
200 index b5ae97f1c12..00000000000
201 --- a/dev-python/spectral-cube/spectral-cube-0.4.0.ebuild
202 +++ /dev/null
203 @@ -1,52 +0,0 @@
204 -# Copyright 1999-2019 Gentoo Authors
205 -# Distributed under the terms of the GNU General Public License v2
206 -
207 -EAPI=6
208 -
209 -PYTHON_COMPAT=( python3_{5,6} )
210 -inherit distutils-r1
211 -
212 -DESCRIPTION="Manipulate astronomical data cubes with Python"
213 -HOMEPAGE="https://spectral-cube.readthedocs.org/"
214 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
215 -
216 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
217 -
218 -LICENSE="BSD"
219 -SLOT="0"
220 -IUSE="doc test"
221 -RESTRICT="!test? ( test )"
222 -
223 -RDEPEND="dev-python/astropy[${PYTHON_USEDEP}]"
224 -DEPEND="${RDEPEND}
225 - dev-python/astropy-helpers[${PYTHON_USEDEP}]
226 - dev-python/setuptools[${PYTHON_USEDEP}]
227 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
228 - test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
229 -
230 -PATCHES=( "${FILESDIR}"/${P}-looseversion.patch )
231 -
232 -python_prepare_all() {
233 - sed -i -e '/auto_use/s/True/False/' setup.cfg || die
234 - distutils-r1_python_prepare_all
235 -}
236 -
237 -python_compile_all() {
238 - if use doc; then
239 - python_setup
240 - PYTHONPATH="${BUILD_DIR}"/lib \
241 - esetup.py build_sphinx --no-intersphinx
242 - fi
243 -}
244 -
245 -python_test() {
246 - pushd spectral_cube/tests/data > /dev/null
247 - "${PYTHON}" make_test_cubes.py
248 - popd > /dev/null
249 - esetup.py test
250 -}
251 -
252 -python_install_all() {
253 - use doc && local HTML_DOCS=( docs/_build/html/ )
254 - distutils-r1_python_install_all
255 -}