Drop patches that were applied upstream
* Updates-test_save.py-for-matplotlib-3.4.patch
* astropy.nddata.utils-astropy.nddata.blocks.patch
* Get-wraps-from-functools-instead-of-astropy.patch
Ole Streicher
2 years ago
debian/patches/Get-wraps-from-functools-instead-of-astropy.patch
less
more
| 0 | |
From: Ole Streicher <olebole@debian.org>
|
| 1 | |
Date: Sat, 29 Jan 2022 20:14:56 +0100
|
| 2 | |
Subject: Get wraps from functools instead of astropy
|
| 3 | |
|
| 4 | |
This fixes compatibility with astropy 5.0.1
|
| 5 | |
---
|
| 6 | |
aplpy/decorators.py | 2 +-
|
| 7 | |
1 file changed, 1 insertion(+), 1 deletion(-)
|
| 8 | |
|
| 9 | |
diff --git a/aplpy/decorators.py b/aplpy/decorators.py
|
| 10 | |
index f29056d..3c22f87 100644
|
| 11 | |
--- a/aplpy/decorators.py
|
| 12 | |
+++ b/aplpy/decorators.py
|
| 13 | |
@@ -1,6 +1,6 @@
|
| 14 | |
import threading
|
| 15 | |
|
| 16 | |
-from astropy.utils.decorators import wraps
|
| 17 | |
+from functools import wraps
|
| 18 | |
|
| 19 | |
mydata = threading.local()
|
| 20 | |
|
| 6 | 6 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
| 7 | 7 |
|
| 8 | 8 |
diff --git a/setup.cfg b/setup.cfg
|
| 9 | |
index e40fca6..43cc5e1 100644
|
|
9 |
index 6bd84ca..c0f6143 100644
|
| 10 | 10 |
--- a/setup.cfg
|
| 11 | 11 |
+++ b/setup.cfg
|
| 12 | |
@@ -36,7 +36,10 @@ docs =
|
| 13 | |
sphinx-astropy
|
|
12 |
@@ -35,7 +35,10 @@ docs =
|
|
13 |
sphinx-astropy
|
| 14 | 14 |
|
| 15 | 15 |
[options.package_data]
|
| 16 | 16 |
-aplpy = *.reg, *.hdr
|
debian/patches/Updates-test_save.py-for-matplotlib-3.4.patch
less
more
| 0 | |
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
|
| 1 | |
Date: Mon, 17 May 2021 11:02:25 -0400
|
| 2 | |
Subject: Updates test_save.py for matplotlib 3.4
|
| 3 | |
|
| 4 | |
---
|
| 5 | |
aplpy/tests/test_save.py | 2 +-
|
| 6 | |
1 file changed, 1 insertion(+), 1 deletion(-)
|
| 7 | |
|
| 8 | |
diff --git a/aplpy/tests/test_save.py b/aplpy/tests/test_save.py
|
| 9 | |
index a5a00dc..20ec9b9 100644
|
| 10 | |
--- a/aplpy/tests/test_save.py
|
| 11 | |
+++ b/aplpy/tests/test_save.py
|
| 12 | |
@@ -27,7 +27,7 @@ def is_format(filename, format):
|
| 13 | |
return f.read(14) == b'%!PS-Adobe-3.0'
|
| 14 | |
elif format == 'svg':
|
| 15 | |
from xml.dom import minidom
|
| 16 | |
- return minidom.parse(f).childNodes[2].attributes['xmlns'].value == 'http://www.w3.org/2000/svg'
|
| 17 | |
+ return minidom.parse(f).childNodes[-1].attributes['xmlns'].value == 'http://www.w3.org/2000/svg'
|
| 18 | |
else:
|
| 19 | |
raise Exception("Unknown format: %s" % format)
|
| 20 | |
|
debian/patches/astropy.nddata.utils-astropy.nddata.blocks.patch
less
more
| 0 | |
From: Erfan Nourbakhsh <erfanxyz@gmail.com>
|
| 1 | |
Date: Tue, 16 Mar 2021 14:22:38 -0700
|
| 2 | |
Subject: astropy.nddata.utils -> astropy.nddata.blocks
|
| 3 | |
|
| 4 | |
Fixes issue #463
|
| 5 | |
---
|
| 6 | |
aplpy/core.py | 2 +-
|
| 7 | |
1 file changed, 1 insertion(+), 1 deletion(-)
|
| 8 | |
|
| 9 | |
diff --git a/aplpy/core.py b/aplpy/core.py
|
| 10 | |
index a658189..cfcb1e6 100644
|
| 11 | |
--- a/aplpy/core.py
|
| 12 | |
+++ b/aplpy/core.py
|
| 13 | |
@@ -15,7 +15,7 @@ from astropy import log
|
| 14 | |
from astropy.wcs import WCS
|
| 15 | |
from astropy.wcs.utils import proj_plane_pixel_scales
|
| 16 | |
from astropy.io import fits
|
| 17 | |
-from astropy.nddata.utils import block_reduce
|
| 18 | |
+from astropy.nddata.blocks import block_reduce
|
| 19 | |
from astropy.visualization import AsymmetricPercentileInterval
|
| 20 | |
from astropy.visualization.wcsaxes import WCSAxes, WCSAxesSubplot
|
| 21 | |
from astropy.coordinates import ICRS
|
| 0 | |
astropy.nddata.utils-astropy.nddata.blocks.patch
|
| 1 | 0 |
Install-test-data.patch
|
| 2 | |
Updates-test_save.py-for-matplotlib-3.4.patch
|
| 3 | |
Get-wraps-from-functools-instead-of-astropy.patch
|