Skip to content

Commit cd14598

Browse files
bsipoczbsipocz
authored
Merge pull request #2829 from cds-astro/cds-domain-change
update cds domain
2 parents 6515f5f + c0e18ce commit cd14598

File tree

17 files changed

+58
-58
lines changed

17 files changed

+58
-58
lines changed

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Accessing Online Astronomical Data
2828
Astroquery is an `astropy <http://www.astropy.org>`_ affiliated package that
2929
contains a collection of tools to access online Astronomical data. Each web
3030
service has its own sub-package. For example, to interface with the `SIMBAD
31-
website <http://simbad.u-strasbg.fr/simbad/>`_, use the ``simbad`` sub-package:
31+
website <https://simbad.cds.unistra.fr/simbad/>`_, use the ``simbad`` sub-package:
3232

3333
.. code-block:: python
3434

‎astroquery/hips2fits/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
88
This package is for querying the CDS hips2fits service, primarily hosted at:
99
10-
* http://alasky.u-strasbg.fr/hips-image-services/hips2fits
11-
* http://alaskybis.u-strasbg.fr/hips-image-services/hips2fits (mirror)
10+
* https://alasky.cds.unistra.fr/hips-image-services/hips2fits
11+
* https://alaskybis.cds.unistra.fr/hips-image-services/hips2fits (mirror)
1212
1313
Note: If the access to hips2fits was helpful for your research
1414
work, the following acknowledgment would be appreciated::
@@ -25,8 +25,8 @@ class Conf(_config.ConfigNamespace):
2525
Configuration parameters for ``astroquery.template_module``.
2626
"""
2727
server = _config.ConfigItem(
28-
["http://alasky.u-strasbg.fr/hips-image-services/hips2fits",
29-
"http://alaskybis.u-strasbg.fr/hips-image-services/hips2fits"],
28+
["https://alasky.cds.unistra.fr/hips-image-services/hips2fits",
29+
"https://alaskybis.cds.unistra.fr/hips-image-services/hips2fits"],
3030
'Name of the template_module server to use.')
3131

3232
timeout = _config.ConfigItem(

‎astroquery/hips2fits/core.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@
2626
@async_to_sync
2727
class hips2fitsClass(BaseQuery):
2828
"""
29-
Query the `CDS hips2fits service <http://alasky.u-strasbg.fr/hips-image-services/hips2fits>`_
29+
Query the `CDS hips2fits service <https://alasky.cds.unistra.fr/hips-image-services/hips2fits>`_
3030
31-
The `CDS hips2fits service <http://alasky.u-strasbg.fr/hips-image-services/hips2fits>`_ offers a way
31+
The `CDS hips2fits service <https://alasky.cds.unistra.fr/hips-image-services/hips2fits>`_ offers a way
3232
to extract FITS images from HiPS sky maps. HiPS is an IVOA standard that combines individual images in
3333
order to produce a progressive hierarchical sky map describing the whole survey. Please refer to the
3434
`IVOA paper <http://www.ivoa.net/documents/HiPS/20170519/REC-HIPS-1.0-20170519.pdf>`_ for more info.
3535
3636
Given an astropy user-defined WCS with an HiPS name
37-
(see the list of valid HiPS names hosted in CDS `here <http://aladin.unistra.fr/hips/list>`_),
37+
(see the list of valid HiPS names hosted in CDS `here <https://aladin.cds.unistra.fr/hips/list>`_),
3838
hips2fits will return you the corresponding FITS image (JPG/PNG output formats are also implemented).
3939
4040
This package implements two methods:
4141
4242
* `~astroquery.hips2fits.hips2fitsClass.query_with_wcs` extracting a FITS image from a HiPS and an
4343
astropy `~astropy.wcs.WCS`.
44-
See `here <http://aladin.unistra.fr/hips/list>`_ all the valid HiPS names hosted in CDS.
44+
See `here <https://aladin.cds.unistra.fr/hips/list>`_ all the valid HiPS names hosted in CDS.
4545
4646
* `~astroquery.hips2fits.hips2fitsClass.query` extracting a FITS image from a HiPS given the output
4747
image pixel size, the center of projection, the type of projection and the field of view.
48-
See `here <http://aladin.unistra.fr/hips/list>`_ all the valid HiPS names hosted in CDS.
48+
See `here <https://aladin.cds.unistra.fr/hips/list>`_ all the valid HiPS names hosted in CDS.
4949
5050
5151
"""
@@ -58,15 +58,15 @@ def __init__(self, *args):
5858
def query_with_wcs(self, hips, wcs, *, format="fits", min_cut=0.5, max_cut=99.5, stretch="linear",
5959
cmap="Greys_r", get_query_payload=False, verbose=False):
6060
"""
61-
Query the `CDS hips2fits service <http://alasky.u-strasbg.fr/hips-image-services/hips2fits>`_ with an
61+
Query the `CDS hips2fits service <https://alasky.cds.unistra.fr/hips-image-services/hips2fits>`_ with an
6262
astropy WCS.
6363
6464
Parameters
6565
----------
6666
hips : str
6767
ID or keyword identifying the HiPS to use.
6868
If multiple HiPS surveys match, one is chosen randomly.
69-
See the list of valid HiPS ids hosted by the CDS `here <http://aladin.unistra.fr/hips/list>`_.
69+
See the list of valid HiPS ids hosted by the CDS `here <https://aladin.cds.unistra.fr/hips/list>`_.
7070
wcs : `~astropy.wcs.WCS`
7171
An astropy WCS defining the astrometry you wish.
7272
Alternatively, you can pass lon, lat, fov, coordsys keywords.
@@ -172,7 +172,7 @@ def query(self, hips, width, height, projection, ra, dec, fov, *,
172172
min_cut=0.5, max_cut=99.5, stretch="linear", cmap="Greys_r",
173173
get_query_payload=False, verbose=False):
174174
"""
175-
Query the `CDS hips2fits service <http://alasky.u-strasbg.fr/hips-image-services/hips2fits>`_.
175+
Query the `CDS hips2fits service <https://alasky.cds.unistra.fr/hips-image-services/hips2fits>`_.
176176
177177
If you have not any WCS, you can call this method by passing:
178178
* The width/height size of the output pixel image
@@ -188,7 +188,7 @@ def query(self, hips, width, height, projection, ra, dec, fov, *,
188188
hips : str
189189
ID or keyword identifying the HiPS to use.
190190
If multiple HiPS surveys match, one is chosen randomly.
191-
See the list of valid HiPS ids hosted by the CDS `here <http://aladin.unistra.fr/hips/list>`_.
191+
See the list of valid HiPS ids hosted by the CDS `here <https://aladin.cds.unistra.fr/hips/list>`_.
192192
width : int
193193
Width in pixels of the output image.
194194
height : int

‎astroquery/ipac/ned/core.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def query_region_iau(self, iau_name, *, frame='Equatorial', equinox='B1950.0',
217217
iau_name : str
218218
IAU coordinate-based name of target on which search is
219219
centered. Definition of IAU coordinates at
220-
http://cdsweb.u-strasbg.fr/Dic/iau-spec.html.
220+
https://cds.unistra.fr/Dic/iau-spec.html.
221221
frame : str, optional
222222
May be one of 'Equatorial', 'Ecliptic', 'Galactic',
223223
'SuperGalactic'. Defaults to 'Equatorial'.
@@ -256,7 +256,7 @@ def query_region_iau_async(self, iau_name, *, frame='Equatorial',
256256
iau_name : str
257257
IAU coordinate-based name of target on which search is
258258
centered. Definition of IAU coordinates at
259-
http://cdsweb.u-strasbg.fr/Dic/iau-spec.html.
259+
https://cds.unistra.fr/Dic/iau-spec.html.
260260
frame : str, optional
261261
May be one of 'Equatorial', 'Ecliptic', 'Galactic',
262262
'SuperGalactic'. Defaults to 'Equatorial'.

‎astroquery/simbad/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
=================
55
66
The SIMBAD query tool creates a `script query
7-
<http://simbad.u-strasbg.fr/simbad/sim-fscript>`__ that returns VOtable XML
7+
<https://simbad.cds.unistra.fr/simbad/sim-fscript>`__ that returns VOtable XML
88
data that is then parsed into a SimbadResult object. This object then
99
parses the data and returns a table parsed with `astropy.io.votable.parse`.
1010
"""
@@ -16,7 +16,7 @@ class Conf(_config.ConfigNamespace):
1616
Configuration parameters for `astroquery.simbad`.
1717
"""
1818
server = _config.ConfigItem(
19-
['simbad.u-strasbg.fr', 'simbad.harvard.edu'],
19+
['simbad.cds.unistra.fr', 'simbad.harvard.edu'],
2020
'Name of the SIMBAD mirror to use.')
2121

2222
timeout = _config.ConfigItem(

‎astroquery/simbad/core.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ class SimbadClass(SimbadBaseQuery):
266266
267267
Note that SIMBAD suggests submitting no more than 6 queries per second; if
268268
you submit more than that, your IP may be temporarily blacklisted
269-
(http://simbad.u-strasbg.fr/simbad/sim-help?Page=sim-url)
269+
(https://simbad.cds.unistra.fr/guide/sim-url.htx)
270270
271271
"""
272-
SIMBAD_URL = 'http://' + conf.server + '/simbad/sim-script'
272+
SIMBAD_URL = 'https://' + conf.server + '/simbad/sim-script'
273273
TIMEOUT = conf.timeout
274274
WILDCARDS = {
275275
'*': 'Any string of characters (including an empty one)',
@@ -292,7 +292,7 @@ class SimbadClass(SimbadBaseQuery):
292292
ROW_LIMIT = conf.row_limit
293293

294294
# also find a way to fetch the votable fields table from
295-
# <http://simbad.u-strasbg.fr/simbad/sim-help?Page=sim-fscript#VotableFields>
295+
# <https://simbad.cds.unistra.fr/guide/sim-fscript.htx#VotableFields>
296296
# tried something for this in this ipython nb
297297
# <http://nbviewer.ipython.org/5851110>
298298
_VOTABLE_FIELDS = ['main_id', 'coordinates']

‎astroquery/simbad/get_votable_fields.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
def reload_votable_fields_json():
10-
content = aud.get_file_contents("http://simbad.u-strasbg.fr/simbad/sim-help?Page=sim-fscript#VotableFields")
10+
content = aud.get_file_contents("https://simbad.cds.unistra.fr/guide/sim-fscript.htx#VotableFields")
1111

1212
import bs4
1313
htmldoc = bs4.BeautifulSoup(content, 'html5lib')

‎astroquery/utils/tests/test_utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def test_suppress_vo_warnings(recwarn):
162162
----------
163163
keywords : list or string
164164
List of keywords, or space-separated set of keywords.
165-
From `Vizier <http://vizier.u-strasbg.fr/doc/asu-summary.htx>`_:
165+
From `Vizier <https://vizier.unistra.fr/doc/asu-summary.htx>`_:
166166
"names or words of title of catalog. The words are and'ed, i.e.
167167
only the catalogues characterized by all the words are selected."
168168
@@ -195,7 +195,7 @@ def test_suppress_vo_warnings(recwarn):
195195
----------
196196
keywords : list or string
197197
List of keywords, or space-separated set of keywords.
198-
From `Vizier <http://vizier.u-strasbg.fr/doc/asu-summary.htx>`_:
198+
From `Vizier <https://vizier.unistra.fr/doc/asu-summary.htx>`_:
199199
"names or words of title of catalog. The words are and'ed, i.e.
200200
only the catalogues characterized by all the words are selected."
201201

‎docs/casda/casda.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,4 @@ Reference/API
200200
.. automodapi:: astroquery.casda
201201
:no-inheritance-diagram:
202202

203-
.. _IAU format: http://cdsweb.u-strasbg.fr/Dic/iau-spec.html.
203+
.. _IAU format: https://cds.unistra.fr/Dic/iau-spec.html.

‎docs/gaia/gaia.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ Your schema name will be automatically added to the provided table name::
562562
>>> from astroquery.gaia import Gaia
563563
>>> Gaia.login()
564564
>>> # Provide a URL pointing to valid VOTable resource
565-
>>> url = ("http://tapvizier.u-strasbg.fr/TAPVizieR/tap/sync/?"
565+
>>> url = ("https://tapvizier.cds.unistra.fr/TAPVizieR/tap/sync/?"
566566
... "REQUEST=doQuery&lang=ADQL&FORMAT=votable&"
567567
... "QUERY=select+*+from+TAP_SCHEMA.columns+where+table_name='II/336/apass9'")
568568
>>> job = Gaia.upload_table(upload_resource=url, table_name="table_test_from_url",

0 commit comments

Comments
 (0)