[python-astropy] 01/03: Add remaining vo/conesearch patch
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Jan 24 10:30:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository python-astropy.
commit 010d9497affe91f480275a804c9a0a02b9775020
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Jan 16 12:32:40 2014 +0100
Add remaining vo/conesearch patch
---
debian/patches/python3.4.patch | 124 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 123 insertions(+), 1 deletion(-)
diff --git a/debian/patches/python3.4.patch b/debian/patches/python3.4.patch
index fccc907..9185d43 100644
--- a/debian/patches/python3.4.patch
+++ b/debian/patches/python3.4.patch
@@ -2,7 +2,7 @@ From: Thomas Robitaille <thomas.robitaille at gmail.com>
Date: Mon, 6 Jan 2014 12:14:00 +0100
Subject: Fixes for Python 3.4.
This merges the patches from the pull request #1945: b3942c4, f653064,
- 16ae7a6, 1d51d8e, 07806be.
+ 16ae7a6, 1d51d8e, 07806be, de32f06.
Origin: https://github.com/astropy/astropy/pull/1945
Bug-Debian: http://bugs.debian.org/734293
--- a/astropy/logger.py
@@ -208,3 +208,125 @@ Bug-Debian: http://bugs.debian.org/734293
return retstr.format(self._namelead(), self._H0, self._Om0,
self._Ode0, self._w0, self._wz, self._Tcmb0,
self._Neff, self.m_nu)
+--- a/astropy/vo/validator/tests/data/printcat.out
++++ b/astropy/vo/validator/tests/data/printcat.out
+@@ -1,43 +1,43 @@
+ {
+- "capabilityClass": "ConeSearch",
+- "capabilityStandardID": "ivo://ivoa.net/std/ConeSearch",
+- "capabilityValidationLevel": "",
+- "contentLevel": "#Research#",
+- "description": "USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. <I/220>) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246>). A2.0 presents right ascension and declinatio [...]
+- "duplicatesIgnored": 0,
+- "identifier": "ivo://CDS.VizieR/I/252#out",
+- "interfaceClass": "ParamHTTP",
+- "interfaceRole": "std?",
+- "interfaceVersion": "",
+- "maxRadius": 180.0,
+- "maxRecords": 9999,
+- "publisher": "CDS",
+- "publisherID": "ivo://CDS",
+- "referenceURL": "http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252",
+- "regionOfRegard": NaN,
+- "resourceID": "ivo://CDS.VizieR/I/252",
+- "shortName": "I/252",
+- "subject": "#Positional_Data#",
+- "tags": "Catalog",
+- "title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
+- "type": "#Catalog#",
+- "updated": "2011-09-14T20:20:21",
+- "url": "http://vizier.u-strasbg.fr/viz-bin/votable/-A?-source=I/252/out&",
+- "validate_expected": "good",
+- "validate_network_error": null,
+- "validate_nexceptions": 0,
+- "validate_nwarnings": 1,
+- "validate_out_db_name": "good",
+- "validate_version": "1.1",
++ "capabilityClass": "ConeSearch",
++ "capabilityStandardID": "ivo://ivoa.net/std/ConeSearch",
++ "capabilityValidationLevel": "",
++ "contentLevel": "#Research#",
++ "description": "USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. <I/220>) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246>). A2.0 presents right ascension and declinatio [...]
++ "duplicatesIgnored": 0,
++ "identifier": "ivo://CDS.VizieR/I/252#out",
++ "interfaceClass": "ParamHTTP",
++ "interfaceRole": "std?",
++ "interfaceVersion": "",
++ "maxRadius": 180.0,
++ "maxRecords": 9999,
++ "publisher": "CDS",
++ "publisherID": "ivo://CDS",
++ "referenceURL": "http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252",
++ "regionOfRegard": NaN,
++ "resourceID": "ivo://CDS.VizieR/I/252",
++ "shortName": "I/252",
++ "subject": "#Positional_Data#",
++ "tags": "Catalog",
++ "title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
++ "type": "#Catalog#",
++ "updated": "2011-09-14T20:20:21",
++ "url": "http://vizier.u-strasbg.fr/viz-bin/votable/-A?-source=I/252/out&",
++ "validate_expected": "good",
++ "validate_network_error": null,
++ "validate_nexceptions": 0,
++ "validate_nwarnings": 1,
++ "validate_out_db_name": "good",
++ "validate_version": "1.1",
+ "validate_warning_types": [
+ "W22"
+- ],
++ ],
+ "validate_warnings": [
+ "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml:13:0: W22: The DEFINITIONS element is deprecated in VOTable 1.1. Ignoring"
+- ],
+- "validate_xmllint": true,
+- "validate_xmllint_content": "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml validates\n",
+- "version": "27-Oct-1998",
++ ],
++ "validate_xmllint": true,
++ "validate_xmllint_content": "./results/f7/bb/d44fbd316338550aed4e1c1a8fc6/vo.xml validates\n",
++ "version": "27-Oct-1998",
+ "waveband": "#Optical#"
+ }
+
+--- a/astropy/vo/validator/tests/test_validate.py
++++ b/astropy/vo/validator/tests/test_validate.py
+@@ -121,8 +121,16 @@
+ func(fout=fout, *args, **kwargs)
+
+ with open(dat_file) as f1:
+- with open(out_file) as f2:
+- assert f1.read() == f2.read()
++ contents_1 = f1.readlines()
++ with open(out_file) as f2:
++ contents_2 = f2.readlines()
++
++ assert len(contents_1) == len(contents_2)
++
++ # json.dumps() might or might not add trailing whitespace
++ # http://bugs.python.org/issue16333
++ for line1, line2 in zip(contents_1, contents_2):
++ assert line1.rstrip() == line2.rstrip()
+
+ def test_tally(self):
+ self.gen_cmp(self.r.tally, 'tally.out')
+--- a/cextern/cfitsio/swapproc.c
++++ b/cextern/cfitsio/swapproc.c
+@@ -75,14 +75,14 @@
+ swap the bytes in the input short integers: ( 0 1 -> 1 0 )
+ */
+ {
++ long ii;
++ size_t peel = get_peel((void*)&svalues[0], sizeof(svalues[0]), nvals, 16);
++
+ if ((long)svalues % 2 != 0) { /* should not happen */
+ ffswap2_slow(svalues, nvals);
+ return;
+ }
+
+- long ii;
+- size_t peel = get_peel((void*)&svalues[0], sizeof(svalues[0]), nvals, 16);
+-
+ ffswap2_slow(svalues, peel);
+ for (ii = peel; ii < (nvals - peel - (nvals - peel) % 8); ii+=8) {
+ swap2_sse2((char*)&svalues[ii]);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-astropy.git
More information about the debian-science-commits
mailing list