summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2016-06-09 16:12:46 +0000
committerSébastien Fabbro <bicatali@gentoo.org>2016-06-09 17:23:27 +0000
commit63ac55e0f89cd9e634fe37e96176045bed11be29 (patch)
tree97b883f1b1f5ba77911fd4a534400694b32c2256 /dev-python/astropy/files
parentmedia-sound/kaudiocreator: remove old (diff)
downloadgentoo-63ac55e0f89cd9e634fe37e96176045bed11be29.tar.gz
gentoo-63ac55e0f89cd9e634fe37e96176045bed11be29.tar.bz2
gentoo-63ac55e0f89cd9e634fe37e96176045bed11be29.zip
dev-python/astropy: force numpy-1.10
Fixing (maybe): Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=585468 Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'dev-python/astropy/files')
-rw-r--r--dev-python/astropy/files/astropy-1.0.4-disable_helper.patch14
-rw-r--r--dev-python/astropy/files/astropy-1.0.4-system-pytest.patch14
-rw-r--r--dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch15
3 files changed, 0 insertions, 43 deletions
diff --git a/dev-python/astropy/files/astropy-1.0.4-disable_helper.patch b/dev-python/astropy/files/astropy-1.0.4-disable_helper.patch
deleted file mode 100644
index 2e751c9ee5db..000000000000
--- a/dev-python/astropy/files/astropy-1.0.4-disable_helper.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Disable astropy-helpers copy
-Bug: https://bugs.debian.org/761055
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -22,7 +22,7 @@
- bitmap = static/wininst_background.bmp
-
- [ah_bootstrap]
--auto_use = True
-+auto_use = False
-
- [pep8]
- # E101 - mix of tabs and spaces
diff --git a/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch b/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
deleted file mode 100644
index 638f7e84bb0b..000000000000
--- a/dev-python/astropy/files/astropy-1.0.4-system-pytest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur astropy-1.0/astropy/tests/helper.py astropy-1.0.pytest/astropy/tests/helper.py
---- astropy-1.0/astropy/tests/helper.py 2015-02-18 22:45:32.000000000 +0100
-+++ astropy-1.0.pytest/astropy/tests/helper.py 2015-02-19 16:20:28.201778929 +0100
-@@ -35,8 +35,8 @@
- AstropyDeprecationWarning,
- AstropyPendingDeprecationWarning)
- from ..config import configuration
--
--if os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
-+# Modified by Fedora package
-+if True or os.environ.get('ASTROPY_USE_SYSTEM_PYTEST') or '_pytest' in sys.modules:
- import pytest
-
- else:
diff --git a/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch b/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
deleted file mode 100644
index efb12737c19b..000000000000
--- a/dev-python/astropy/files/astropy-1.1.1-fix-wcs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Kacper Kowalik <xarthisius.kk@gmail.com>
-Description: Copy keys to a list, since orignal map is modified
-Url: https://github.com/astropy/astropy/issues/4477
-Bug: https://github.com/astropy/astropy/issues/4460
---- a/astropy/wcs/wcs.py
-+++ b/astropy/wcs/wcs.py
-@@ -988,7 +988,7 @@
- """
- # Never pass SIP coefficients to wcslib
- # CTYPE must be passed with -SIP to wcslib
-- for key in (m.group() for m in map(SIP_KW.match, header.keys())
-+ for key in (m.group() for m in map(SIP_KW.match, list(header))
- if m is not None):
- del header[key]
-