Merge pull request #2351 from esdc-esac-esa-int/iso-1.0.0_issue2344_failing_remote_test

Issue #2344: test fixed, examples in doc tested and updated

Author: bsipocz

astroquery/esa/iso/__init__.py

@@ -1,13 +1,11 @@
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
-
 """
 
 from astropy import config as _config

astroquery/esa/iso/core.py

@@ -1,15 +1,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 14 July 2020
-
-
 """
 import re
 from astroquery.utils.tap.core import TapPlus

astroquery/esa/iso/tests/__init__.py

@@ -1,11 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
 """

astroquery/esa/iso/tests/dummy_handler.py

@@ -1,12 +1,11 @@
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
 """
 
 

astroquery/esa/iso/tests/dummy_tap_handler.py

@@ -1,13 +1,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
 """
 
 from ....utils.tap.model.taptable import TapTableMeta

astroquery/esa/iso/tests/setup_package.py

@@ -1,13 +1,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
 """
 
 from __future__ import absolute_import

astroquery/esa/iso/tests/test_iso.py

@@ -1,13 +1,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
-
-@author: Jesus Salgado
-@contact: [email protected]
+=====================
+ISO Astroquery Module
+=====================
 
 European Space Astronomy Centre (ESAC)
 European Space Agency (ESA)
 
-Created on 15 July 2020
 """
 
 import pytest
@@ -61,7 +60,7 @@ def test_get_postcard_link_verbose(self):
     @pytest.mark.remote_data
     def test_download_data(self):
         parameters = {'tdt': "40001501",
-                      'level': "DEFAULT_DATA_SET",
+                      'product_level': "DEFAULT_DATA_SET",
                       'retrieval_type': "OBSERVATION",
                       'filename': "file",
                       'verbose': False}

docs/esa/iso.rst

@@ -105,7 +105,7 @@ provided by this service, see section 'Getting Tables Details'.
   -rw-r--r-- idaops/0      14400 2005-12-23 12:02:55 ././ISO1601052542/EXTRAKON//psph80000203.fits 
   -rw-r--r-- idaops/0       5599 2005-12-23 12:02:55 ././ISO1601052542/EXTRAKON//ppch80000203.gif 
   -rw-r--r-- idaops/0     266240 2005-12-23 12:02:54 ././ISO1601052542/EXTRAKON//C10180000203.tar 
-  >>> tar.extract("././ISO1601052542/EXTRAKON//psph80000203.fits")
+  >>> tar.extract("././ISO1648561466/EXTRAKON//psph80000203.fits")
   >>> tar.extractall()
 
 'download_data' method invokes the data download of files from the ISO Data Archive, using the 
@@ -350,7 +350,7 @@ Images can be displayed by using the following code:
   >>> from matplotlib.colors import LogNorm
   >>> 
   >>> #We configure the plot to be interactive
-  >>> %matplotlib widget
+  >>> # matplotlib widget
   >>> plt.ion()
   >>> plt.imshow(image_data, cmap='Reds')
   >>> plt.colorbar()
@@ -422,7 +422,7 @@ And spectra can be displayed by using the following code:
   >>> lamb = specdata['WAVE']  * u.um
   >>> flux = specdata['FLUX']  * u.Unit('W cm-2 um-1')
   >>> spec = Spectrum1D(spectral_axis=lamb, flux=flux)
-  >>> %matplotlib widget
+  >>> # matplotlib widget
   >>> plt.ion()
   >>> f, ax = plt.subplots()  
   >>> ax.step(spec.spectral_axis, spec.flux)