1 |
commit: 3c4b373497aeea66ccd19209c3395b306a880c7e |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 28 23:42:26 2016 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 28 23:44:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4b3734 |
7 |
|
8 |
dev-python/astropy: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-python/astropy/Manifest | 2 +- |
13 |
.../{astropy-1.1.2.ebuild => astropy-1.3.ebuild} | 37 ++++------ |
14 |
.../astropy/files/astropy-1.1.2-cfitsio-338.patch | 35 --------- |
15 |
.../files/astropy-1.1.2-fix-for-pytest-28.patch | 37 ---------- |
16 |
.../files/astropy-1.3-mark-known-failures.patch | 84 ++++++++++++++++++++++ |
17 |
5 files changed, 100 insertions(+), 95 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/astropy/Manifest b/dev-python/astropy/Manifest |
20 |
index 6cf0a59..fb18d25 100644 |
21 |
--- a/dev-python/astropy/Manifest |
22 |
+++ b/dev-python/astropy/Manifest |
23 |
@@ -1,2 +1,2 @@ |
24 |
-DIST astropy-1.1.2.tar.gz 8059713 SHA256 6f0d84cd7dfb304bb437dda666406a1d42208c16204043bc920308ff8ffdfad1 SHA512 b83c4a1415a3eb8c016507705d0d2f22971e4da937bb97953eec08f8f856933d8fa76ce8c536122235b19e7879b16add2e20fd2fee3e488f9b2b4bf1b9f4dbdb WHIRLPOOL 01cdfd33c29f7128e88be3f53b7ecdec37d95ba06acae6ceeba83746e0454aa220396fb00519b30639ac01b5b297fad004488d34856295735e04924d154c4eb9 |
25 |
DIST astropy-1.2.1.tar.gz 8179665 SHA256 0d7ef702166f26fed239b59fc12edcd5243ca5bf562a36202fd8c6b0270d6e48 SHA512 2ef37537a4c6b2ec50a1d898f600978475c9c5d2cb66ba19d06782656e9ddcb4aa6a8e53217e318448cedac45dac0dce0d8cc2fe94cddc15ebb306b3b0794595 WHIRLPOOL d37374f23a0121fdc92fa572facc248f0a571dacb8edcf1a9d0987d6a40287de199262ec01f654bd6ea5aece826e5588d2869558152adffe9ab490fa46f2e36d |
26 |
+DIST astropy-1.3.tar.gz 8372366 SHA256 49de3e86482abe24e3cd02c4a30a469ee4b928d5b46ea5f70fa605ff6f9c6d38 SHA512 1dd667af78be568bd4719d273d432881d7dea03725deb24a045726b315f8e5cd8afac3f6f925867b05c4c7924cd71d7e7d6ae15985a95c7fcc4421e52273983b WHIRLPOOL 2913c195989c2af0a58ab5e675bd41607bb28273265c0a502c8b1d33925994f9127c9a03058b55aabc1b3a8c594e89ddbd2d5fc38c42dd4723998bad01c7bd45 |
27 |
|
28 |
diff --git a/dev-python/astropy/astropy-1.1.2.ebuild b/dev-python/astropy/astropy-1.3.ebuild |
29 |
similarity index 63% |
30 |
rename from dev-python/astropy/astropy-1.1.2.ebuild |
31 |
rename to dev-python/astropy/astropy-1.3.ebuild |
32 |
index c8b61ae..d85184f 100644 |
33 |
--- a/dev-python/astropy/astropy-1.1.2.ebuild |
34 |
+++ b/dev-python/astropy/astropy-1.3.ebuild |
35 |
@@ -6,7 +6,7 @@ EAPI=6 |
36 |
|
37 |
PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
38 |
|
39 |
-inherit distutils-r1 |
40 |
+inherit distutils-r1 xdg-utils |
41 |
|
42 |
DESCRIPTION="Core functionality for performing astrophysics with Python" |
43 |
HOMEPAGE="http://astropy.org/" |
44 |
@@ -18,12 +18,12 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
45 |
IUSE="doc test" |
46 |
|
47 |
RDEPEND=" |
48 |
- >=dev-libs/expat-2.1.0:0= |
49 |
+ dev-libs/expat:0= |
50 |
dev-python/configobj[${PYTHON_USEDEP}] |
51 |
>=dev-python/numpy-1.10[${PYTHON_USEDEP}] |
52 |
dev-python/ply[${PYTHON_USEDEP}] |
53 |
dev-python/six[${PYTHON_USEDEP}] |
54 |
- >=sci-astronomy/erfa-1.2:0= |
55 |
+ >=sci-astronomy/erfa-1.3:0= |
56 |
>=sci-astronomy/wcslib-5:0= |
57 |
sci-libs/cfitsio:0= |
58 |
sys-libs/zlib:0=" |
59 |
@@ -34,13 +34,13 @@ DEPEND="${RDEPEND} |
60 |
virtual/pkgconfig |
61 |
doc? ( |
62 |
media-gfx/graphviz |
63 |
- $(python_gen_cond_dep 'dev-libs/libxml2[${PYTHON_USEDEP}]' python2_7) |
64 |
- $(python_gen_cond_dep 'dev-python/h5py[${PYTHON_USEDEP}]' python2_7) |
65 |
- $(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7) |
66 |
- $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' python2_7) |
67 |
- $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) |
68 |
- $(python_gen_cond_dep 'dev-python/wcsaxes[${PYTHON_USEDEP}]' python2_7) |
69 |
- $(python_gen_cond_dep 'sci-libs/scipy[${PYTHON_USEDEP}]'python2_7) |
70 |
+ dev-libs/libxml2[${PYTHON_USEDEP}] |
71 |
+ dev-python/h5py[${PYTHON_USEDEP}] |
72 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
73 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
74 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
75 |
+ dev-python/wcsaxes[${PYTHON_USEDEP}] |
76 |
+ sci-libs/scipy[${PYTHON_USEDEP}] |
77 |
) |
78 |
test? ( |
79 |
dev-libs/libxml2[${PYTHON_USEDEP}] |
80 |
@@ -50,20 +50,13 @@ DEPEND="${RDEPEND} |
81 |
sci-libs/scipy[${PYTHON_USEDEP}] |
82 |
)" |
83 |
|
84 |
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" |
85 |
- |
86 |
PATCHES=( |
87 |
- "${FILESDIR}/${PN}-1.0.4-system-six.patch" |
88 |
- "${FILESDIR}/${PN}-1.0.4-system-configobj.patch" |
89 |
- "${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch" |
90 |
- "${FILESDIR}/${PN}-1.1.2-fix-for-pytest-28.patch" |
91 |
- "${FILESDIR}/${PN}-1.1.2-cfitsio-338.patch" |
92 |
+ "${FILESDIR}"/${PN}-1.0.4-system-six.patch |
93 |
+ "${FILESDIR}"/${PN}-1.0.4-system-configobj.patch |
94 |
+ "${FILESDIR}"/${PN}-1.3-mark-known-failures.patch |
95 |
+ "${FILESDIR}"/${PN}-1.2.1-cfitsio-338.patch |
96 |
) |
97 |
|
98 |
-pkg_setup() { |
99 |
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |
100 |
-} |
101 |
- |
102 |
python_prepare_all() { |
103 |
export mydistutilsargs="--offline" |
104 |
export ASTROPY_USE_SYSTEM_PYTEST=True |
105 |
@@ -75,12 +68,12 @@ python_prepare_all() { |
106 |
[build] |
107 |
use_system_libraries=1 |
108 |
EOF |
109 |
+ xdg_environment_reset |
110 |
distutils-r1_python_prepare_all |
111 |
} |
112 |
|
113 |
python_compile_all() { |
114 |
if use doc; then |
115 |
- python_setup "python2*" |
116 |
VARTEXFONTS="${T}"/fonts \ |
117 |
MPLCONFIGDIR="${BUILD_DIR}" \ |
118 |
PYTHONPATH="${BUILD_DIR}"/lib \ |
119 |
|
120 |
diff --git a/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch b/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch |
121 |
deleted file mode 100644 |
122 |
index d4a8fa0..00000000 |
123 |
--- a/dev-python/astropy/files/astropy-1.1.2-cfitsio-338.patch |
124 |
+++ /dev/null |
125 |
@@ -1,35 +0,0 @@ |
126 |
-Author: Ole Streicher <olebole@××××××.org> |
127 |
-Description: Make TFORMx check more flexible |
128 |
- The maximal column length in cfitsio changed between version 3370 and 3380. |
129 |
- This patch checks their syntax, without a specific length. |
130 |
-Bug: https://github.com/astropy/astropy/issues/4646 |
131 |
---- a/astropy/io/fits/tests/test_image.py |
132 |
-+++ b/astropy/io/fits/tests/test_image.py |
133 |
-@@ -4,6 +4,7 @@ |
134 |
- |
135 |
- import math |
136 |
- import os |
137 |
-+import re |
138 |
- import time |
139 |
- import warnings |
140 |
- |
141 |
-@@ -1010,7 +1011,7 @@ |
142 |
- hdu.writeto(self.temp('test.fits')) |
143 |
- |
144 |
- with fits.open(self.temp('test.fits')) as hdul: |
145 |
-- assert (hdul['SCI'].data == cube).all() |
146 |
-+ assert np.abs(hdul['SCI'].data - cube).max() < 1./15. |
147 |
- |
148 |
- def test_subtractive_dither_seed(self): |
149 |
- """ |
150 |
-@@ -1265,8 +1266,8 @@ |
151 |
- |
152 |
- with fits.open(self.temp('test.fits'), |
153 |
- disable_image_compression=True) as h: |
154 |
-- assert h[1].header['TFORM1'] == '1PB(30)' |
155 |
-- assert h[1].header['TFORM2'] == '1PB(359)' |
156 |
-+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM1']) |
157 |
-+ assert re.match(r'^1PB\(\d+\)$', h[1].header['TFORM2']) |
158 |
- |
159 |
- def test_compression_update_header(self): |
160 |
- """Regression test for |
161 |
|
162 |
diff --git a/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch b/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch |
163 |
deleted file mode 100644 |
164 |
index 0d62e9c..00000000 |
165 |
--- a/dev-python/astropy/files/astropy-1.1.2-fix-for-pytest-28.patch |
166 |
+++ /dev/null |
167 |
@@ -1,37 +0,0 @@ |
168 |
-From e904df784b91fd45e7dfcdec0713c471bb03efff Mon Sep 17 00:00:00 2001 |
169 |
-From: Thomas Robitaille <thomas.robitaille@×××××.com> |
170 |
-Date: Fri, 1 Jan 2016 19:36:39 +0000 |
171 |
-Bug: https://bugs.debian.org/812648 |
172 |
-Bug: https://github.com/astropy/astropy/pull/4349 |
173 |
-Subject: [PATCH] Fixes to pytest plugins for pytest >= 2.8.0 |
174 |
---- a/astropy/tests/pytest_plugins.py |
175 |
-+++ b/astropy/tests/pytest_plugins.py |
176 |
-@@ -161,7 +161,10 @@ |
177 |
- # handling __doctest_skip__) doesn't happen. |
178 |
- def collect(self): |
179 |
- if self.fspath.basename == "conftest.py": |
180 |
-- module = self.config._conftest.importconftest(self.fspath) |
181 |
-+ try: |
182 |
-+ module = self.config._conftest.importconftest(self.fspath) |
183 |
-+ except AttributeError: # pytest >= 2.8.0 |
184 |
-+ module = self.config.pluginmanager._importconftest(self.fspath) |
185 |
- else: |
186 |
- try: |
187 |
- module = self.fspath.pyimport() |
188 |
-@@ -191,8 +194,14 @@ |
189 |
- def runtest(self): |
190 |
- # satisfy `FixtureRequest` constructor... |
191 |
- self.funcargs = {} |
192 |
-- self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {}) |
193 |
-- fixture_request = doctest_plugin.FixtureRequest(self) |
194 |
-+ try: |
195 |
-+ self._fixtureinfo = doctest_plugin.FuncFixtureInfo((), [], {}) |
196 |
-+ fixture_request = doctest_plugin.FixtureRequest(self) |
197 |
-+ except AttributeError: # pytest >= 2.8.0 |
198 |
-+ python_plugin = config.pluginmanager.getplugin('python') |
199 |
-+ self._fixtureinfo = python_plugin.FuncFixtureInfo((), [], {}) |
200 |
-+ fixture_request = python_plugin.FixtureRequest(self) |
201 |
-+ |
202 |
- failed, tot = doctest.testfile( |
203 |
- str(self.fspath), module_relative=False, |
204 |
- optionflags=opts, parser=DocTestParserPlus(), |
205 |
|
206 |
diff --git a/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch b/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch |
207 |
new file mode 100644 |
208 |
index 00000000..1a30bc1 |
209 |
--- /dev/null |
210 |
+++ b/dev-python/astropy/files/astropy-1.3-mark-known-failures.patch |
211 |
@@ -0,0 +1,84 @@ |
212 |
+From: Ole Streicher <olebole@××××××.org> |
213 |
+Date: Tue, 13 Dec 2016 09:41:39 +0100 |
214 |
+Subject: Mark all known test failures as xfail. These failures have been |
215 |
+ discussed with upstream. |
216 |
+ |
217 |
+--- |
218 |
+ astropy/table/tests/test_info.py | 4 +++- |
219 |
+ astropy/tests/tests/test_socketblocker.py | 4 ++-- |
220 |
+ astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++ |
221 |
+ astropy/vo/samp/tests/test_standard_profile.py | 2 ++ |
222 |
+ 4 files changed, 11 insertions(+), 3 deletions(-) |
223 |
+ |
224 |
+diff --git a/astropy/table/tests/test_info.py b/astropy/table/tests/test_info.py |
225 |
+index 2bbcc7a..50fbdb4 100644 |
226 |
+--- a/astropy/table/tests/test_info.py |
227 |
++++ b/astropy/table/tests/test_info.py |
228 |
+@@ -8,6 +8,7 @@ from collections import OrderedDict |
229 |
+ |
230 |
+ import numpy as np |
231 |
+ |
232 |
++from ...tests.helper import pytest |
233 |
+ from ...extern import six |
234 |
+ from ...extern.six.moves import cStringIO as StringIO |
235 |
+ from ... import units as u |
236 |
+@@ -229,7 +230,8 @@ def test_class_attribute(): |
237 |
+ t.info(out=out) |
238 |
+ assert out.getvalue().splitlines() == exp |
239 |
+ |
240 |
+- |
241 |
++# see https://github.com/astropy/astropy/issues/4336 |
242 |
++@×××××××××××.xfail() |
243 |
+ def test_ignore_warnings(): |
244 |
+ t = table.Table([[np.nan, np.nan]]) |
245 |
+ with warnings.catch_warnings(record=True) as warns: |
246 |
+diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py |
247 |
+index c362fa5..783defe 100644 |
248 |
+--- a/astropy/tests/tests/test_socketblocker.py |
249 |
++++ b/astropy/tests/tests/test_socketblocker.py |
250 |
+@@ -66,8 +66,8 @@ PY3_4 = sys.version_info[:2] >= (3, 4) |
251 |
+ def _square(x): |
252 |
+ return x ** 2 |
253 |
+ |
254 |
+- |
255 |
+-@×××××××××××.skipif('not PY3_4 or sys.platform == "win32" or sys.platform.startswith("gnu0")') |
256 |
++# see https://github.com/astropy/astropy/issues/4193 |
257 |
++@×××××××××××.skipif(True, reason="Blocks on Debian CI test") |
258 |
+ def test_multiprocessing_forkserver(): |
259 |
+ """ |
260 |
+ Test that using multiprocessing with forkserver works. Perhaps |
261 |
+diff --git a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py |
262 |
+index 53436dd..4c710e7 100644 |
263 |
+--- a/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py |
264 |
++++ b/astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py |
265 |
+@@ -3,6 +3,8 @@ from ..core import WCSAxes |
266 |
+ import matplotlib.pyplot as plt |
267 |
+ from matplotlib.backend_bases import KeyEvent |
268 |
+ |
269 |
++import pytest |
270 |
++ |
271 |
+ from ....wcs import WCS |
272 |
+ from ....extern import six |
273 |
+ from ....coordinates import FK5 |
274 |
+@@ -93,6 +95,8 @@ class TestDisplayWorldCoordinate(BaseImageTests): |
275 |
+ |
276 |
+ assert string_world5 == six.u('267.652 -28\xb046\'23" (world, overlay 3)') |
277 |
+ |
278 |
++ # See https://github.com/astropy/astropy/issues/5601 |
279 |
++ @pytest.mark.xfail() |
280 |
+ def test_cube_coords(self, tmpdir): |
281 |
+ wcs = WCS(self.cube_header) |
282 |
+ |
283 |
+diff --git a/astropy/vo/samp/tests/test_standard_profile.py b/astropy/vo/samp/tests/test_standard_profile.py |
284 |
+index 325ac96..ac25e55 100644 |
285 |
+--- a/astropy/vo/samp/tests/test_standard_profile.py |
286 |
++++ b/astropy/vo/samp/tests/test_standard_profile.py |
287 |
+@@ -62,6 +62,8 @@ class TestStandardProfile(object): |
288 |
+ |
289 |
+ self.hub.stop() |
290 |
+ |
291 |
++ # see https://github.com/astropy/astropy/issues/5460 |
292 |
++ @pytest.mark.skipif(True, reason="Setup fails due to SSL problems") |
293 |
+ def test_main(self): |
294 |
+ |
295 |
+ self.client1_id = self.client1.get_public_id() |