[python-astropy] 02/02: Remove patches that are in the new version
Ole Streicher
olebole at moszumanska.debian.org
Thu Feb 12 09:18:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository python-astropy.
commit a5fc8c423cb7a240061c35a097f1d17480d817bb
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Feb 12 10:17:55 2015 +0100
Remove patches that are in the new version
---
debian/changelog | 6 +++
debian/patches/Remove_float128.patch | 23 ----------
debian/patches/fix_config_update.patch | 32 --------------
debian/patches/fix_hurd.patch | 17 --------
debian/patches/helper_compatibility.patch | 27 ------------
debian/patches/mark_known_failures.patch | 2 +-
.../remove_precompiled_wcslib_version.patch | 50 ----------------------
debian/patches/series | 5 ---
8 files changed, 7 insertions(+), 155 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ccb2a3..11cfead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-astropy (1.0~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ -- Ole Streicher <olebole at debian.org> Thu, 12 Feb 2015 09:26:56 +0100
+
python-astropy (1.0~rc1-3) experimental; urgency=low
* Fix last FTBS on Hurd
diff --git a/debian/patches/Remove_float128.patch b/debian/patches/Remove_float128.patch
deleted file mode 100644
index 3a4c0cd..0000000
--- a/debian/patches/Remove_float128.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From aa4fed256a64867f633f3c1098dce1b98058ea72 Mon Sep 17 00:00:00 2001
-From: Miguel de Val-Borro <miguel at archlinux.net>
-Date: Wed, 28 Jan 2015 18:47:49 -0500
-Subject: [PATCH] Remove float128 from DTYPES in 32-bit architecture
---- a/astropy/io/ascii/tests/test_ecsv.py
-+++ b/astropy/io/ascii/tests/test_ecsv.py
-@@ -8,6 +8,7 @@
- """
- import os
- import copy
-+import sys
-
- import numpy as np
-
-@@ -28,7 +29,7 @@
- DTYPES = ['bool', 'int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32',
- 'uint64', 'float16', 'float32', 'float64', 'float128',
- 'str']
--if os.name == 'nt':
-+if os.name == 'nt' or sys.maxsize <= 2**32:
- DTYPES.remove('float128')
-
- T_DTYPES = Table()
diff --git a/debian/patches/fix_config_update.patch b/debian/patches/fix_config_update.patch
deleted file mode 100644
index 0f0f112..0000000
--- a/debian/patches/fix_config_update.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e44abd86291e5b495ebf22288ac57211048ffd4 Mon Sep 17 00:00:00 2001
-From: Ole Streicher <debian at liska.ath.cx>
-Date: Thu, 5 Feb 2015 13:40:12 +0100
-Subject: [PATCH] Return False on update if there is no default configuration
- file. If there is no default configuration file, the update function should
- do nothing, which means it should return False (and not None). Also the
- documentation is corrected (and may lead to another problem :-))
-
----
- astropy/config/configuration.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/astropy/config/configuration.py
-+++ b/astropy/config/configuration.py
-@@ -813,7 +813,7 @@
- Raises
- ------
- ConfigurationDefaultMissingError
-- If the default configuration could not be found.
-+ If the version number of the package could not determined.
-
- """
-
-@@ -826,7 +826,7 @@
- # There is no template configuration file, which basically
- # means the affiliated package is not using the configuration
- # system, so just return.
-- return
-+ return False
-
- cfgfn = get_config(pkg).filename
-
diff --git a/debian/patches/fix_hurd.patch b/debian/patches/fix_hurd.patch
deleted file mode 100644
index bc278f0..0000000
--- a/debian/patches/fix_hurd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Catch import error due to lacking sem_open support on Hurd.
---- a/astropy/io/ascii/cparser.pyx
-+++ b/astropy/io/ascii/cparser.pyx
-@@ -389,7 +389,11 @@
-
- cdef list line_comments = self._get_comments(self.tokenizer)
- cdef int N = self.parallel
-- queue = multiprocessing.Queue()
-+ try:
-+ queue = multiprocessing.Queue()
-+ except (ImportError, NotImplementedError, AttributeError):
-+ self.raise_error("shared semaphore implementation required "
-+ "but not available")
- cdef int offset = self.tokenizer.source_pos
-
- if offset == source_len: # no data
diff --git a/debian/patches/helper_compatibility.patch b/debian/patches/helper_compatibility.patch
deleted file mode 100644
index 226ea54..0000000
--- a/debian/patches/helper_compatibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ae37bf624865cf6ac6b2ba0663d1862776788e6d Mon Sep 17 00:00:00 2001
-From: "Erik M. Bray" <embray at stsci.edu>
-Date: Thu, 29 Jan 2015 12:45:39 -0500
-Subject: [PATCH] Support importing is_distutils_display_option from its old
- location to play better with installations of old versions of astropy-helpers
- (users really shouldn't be installing it in the first place, but in case they
- have this will get them a lot further than it does currently
-
----
- setup.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,11 @@
- import astropy
- from astropy_helpers.setup_helpers import (
- register_commands, adjust_compiler, get_package_info, get_debug_option)
--from astropy_helpers.distutils_helpers import is_distutils_display_option
-+try:
-+ from astropy_helpers.distutils_helpers import is_distutils_display_option
-+except:
-+ # For astropy-helpers v0.4.x
-+ from astropy_helpers.setup_helpers import is_distutils_display_option
- from astropy_helpers.git_helpers import get_git_devstr
- from astropy_helpers.version_helpers import generate_version_py
-
diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index da81d37..51ceb56 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -32,7 +32,7 @@ Description: Mark all known test failures as xfail.
filename = str(tmpdir.join('test_read_with_hdu_1.fits'))
--- a/astropy/coordinates/tests/test_frames.py
+++ b/astropy/coordinates/tests/test_frames.py
-@@ -512,6 +512,8 @@
+@@ -543,6 +543,8 @@
with pytest.raises(ValueError):
GCRS(obsgeoloc=[1, 3]*u.km) #incorrect shape
diff --git a/debian/patches/remove_precompiled_wcslib_version.patch b/debian/patches/remove_precompiled_wcslib_version.patch
deleted file mode 100644
index 1c1f360..0000000
--- a/debian/patches/remove_precompiled_wcslib_version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 150acb1ec651ccad33129eba96b55917b8f96765 Mon Sep 17 00:00:00 2001
-From: Ole Streicher <debian at liska.ath.cx>
-Date: Wed, 4 Feb 2015 10:07:52 +0100
-Subject: [PATCH] Remove precompiled wcslib version Up to of (at least) 4.25.1,
- the wcslib version cannot be determined at runtime. Taking the version string
- from the header file will lead to wrong results if the wcslib was upgraded
- after the astropy installation. Therefore, it is better to remove the number
- at all unless we can query the version number at runtime.
-
----
- astropy/wcs/src/wcslib_wrap.c | 4 ----
- astropy/wcs/tests/test_wcsprm.py | 8 ++------
- 2 files changed, 2 insertions(+), 10 deletions(-)
-
---- a/astropy/wcs/src/wcslib_wrap.c
-+++ b/astropy/wcs/src/wcslib_wrap.c
-@@ -3450,10 +3450,6 @@
- wcsprintf_set(NULL);
- wcserr_enable(1);
-
-- if (PyModule_AddStringConstant(m, "__version__", XSTRINGIFY(WCSLIB_VERSION))) {
-- return -1;
-- }
--
- return (
- PyModule_AddObject(m, "Wcsprm", (PyObject *)&PyWcsprmType) ||
- CONSTANT(WCSSUB_LONGITUDE) ||
---- a/astropy/wcs/tests/test_wcsprm.py
-+++ b/astropy/wcs/tests/test_wcsprm.py
-@@ -785,18 +785,14 @@
- assert w.compare(w2, tolerance=1e-6)
-
-
-- at pytest.mark.xfail(
-- LooseVersion(_wcs.__version__) < LooseVersion("4.25"),
-- reason="wcslib < 4.25")
-+ at pytest.mark.xfail()
- def test_radesys_defaults():
- w = _wcs.Wcsprm()
- w.ctype = ['RA---TAN', 'DEC--TAN']
- w.set()
- assert w.radesys == "ICRS"
-
-- at pytest.mark.xfail(
-- LooseVersion(_wcs.__version__) < LooseVersion("4.25"),
-- reason="wcslib < 4.25")
-+ at pytest.mark.xfail()
- def test_radesys_defaults_full():
-
- # As described in Section 3.1 of the FITS standard "Equatorial and ecliptic
diff --git a/debian/patches/series b/debian/patches/series
index cae58e1..82acab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
mark_known_failures.patch
disable_helper.patch
-helper_compatibility.patch
-Remove_float128.patch
-fix_hurd.patch
-remove_precompiled_wcslib_version.patch
-fix_config_update.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git
More information about the debian-science-commits
mailing list