Merge pull request astropy#14824 from meeseeksmachine/auto-backport-o…

…f-pr-14681-on-v5.3.x

Backport PR astropy#14681 on branch v5.3.x (Update domain of CDS from u-strasbg.fr to unistra.fr + https instead of http)

astropy/coordinates/data/constellation_data_roman87.dat

@@ -1,4 +1,4 @@
-# This data file is from Roman et al. 1987: http://cdsarc.u-strasbg.fr/viz-bin/Cat?VI/42
+# This data file is from Roman et al. 1987: https://cdsarc.cds.unistra.fr/viz-bin/Cat?VI/42
   0.0000 24.0000  88.0000 UMi
   8.0000 14.5000  86.5000 UMi
  21.0000 23.0000  86.1667 UMi

astropy/coordinates/data/constellation_names.dat

@@ -1,4 +1,4 @@
-# This list gives the official IAU constellation names via vizier:  http://vizier.u-strasbg.fr/vizier/VizieR/constellations.htx
+# This list gives the official IAU constellation names via vizier:  https://vizier.cds.unistra.fr/vizier/VizieR/constellations.htx
 And Andromeda
 Ant Antlia
 Aps Apus

astropy/coordinates/funcs.py

@@ -209,7 +209,7 @@ def get_constellation(coord, short_name=False, constellation_list="iau"):
     To determine which constellation a point on the sky is in, this precesses
     to B1875, and then uses the Delporte boundaries of the 88 modern
     constellations, as tabulated by
-    `Roman 1987 <http://cdsarc.u-strasbg.fr/viz-bin/Cat?VI/42>`_.
+    `Roman 1987 <https://cdsarc.cds.unistra.fr/viz-bin/cat/VI/42>`_.
     """
     if constellation_list != "iau":
         raise ValueError("only 'iau' us currently supported for constellation_list")

astropy/coordinates/name_resolve.py

@@ -33,7 +33,7 @@ class sesame_url(ScienceState):
     """
 
     _value = [
-        "http://cdsweb.u-strasbg.fr/cgi-bin/nph-sesame/",
+        "https://cds.unistra.fr/cgi-bin/nph-sesame/",
         "http://vizier.cfa.harvard.edu/viz-bin/nph-sesame/",
     ]
 

astropy/coordinates/sky_coordinate.py

@@ -1730,7 +1730,7 @@ def get_constellation(self, short_name=False, constellation_list="iau"):
         To determine which constellation a point on the sky is in, this first
         precesses to B1875, and then uses the Delporte boundaries of the 88
         modern constellations, as tabulated by
-        `Roman 1987 <http://cdsarc.u-strasbg.fr/viz-bin/Cat?VI/42>`_.
+        `Roman 1987 <https://cdsarc.cds.unistra.fr/viz-bin/Cat?VI/42>`_.
 
         See Also
         --------

astropy/coordinates/tests/test_frames_with_velocity.py

@@ -125,8 +125,8 @@ def test_expected_arg_names(cls, lon, lat):
     frame = cls(**kwargs, **DISTANCE, **RADIAL_VELOCITY)
 
 
-# these data are extracted from the vizier copy of XHIP:
-# http://vizier.u-strasbg.fr/viz-bin/VizieR-3?-source=+V/137A/XHIP
+# these data are extracted from the vizier version of XHIP:
+# https://vizier.cds.unistra.fr/viz-bin/VizieR-3?-source=+V/137A/XHIP
 _xhip_head = """
 ------ ------------ ------------ -------- -------- ------------ ------------ ------- -------- -------- ------- ------ ------ ------
        R            D            pmRA     pmDE                               Di      pmGLon   pmGLat   RV      U      V      W

astropy/coordinates/tests/test_name_resolve.py

@@ -123,9 +123,7 @@
 def test_names():
     # First check that sesame is up
     if (
-        urllib.request.urlopen(
-            "http://cdsweb.u-strasbg.fr/cgi-bin/nph-sesame"
-        ).getcode()
+        urllib.request.urlopen("https://cdsweb.unistra.fr/cgi-bin/nph-sesame").getcode()
         != 200
     ):
         pytest.skip(

astropy/io/ascii/cds.py

@@ -209,7 +209,7 @@ def process_lines(self, lines):
 class Cds(core.BaseReader):
     """CDS format table.
 
-    See: http://vizier.u-strasbg.fr/doc/catstd.htx
+    See: https://vizier.unistra.fr/doc/catstd.htx
 
     Example::
 

astropy/io/ascii/mrt.py

@@ -212,7 +212,7 @@ def write_byte_by_byte(self):
         See the Vizier MRT Standard documentation in the link below for more details
         on these. An example Byte-By-Byte table is shown here.
 
-        See: http://vizier.u-strasbg.fr/doc/catstd-3.1.htx
+        See: https://vizier.unistra.fr/doc/catstd-3.1.htx
 
         Example::
 

astropy/io/ascii/tests/test_c_reader.py

@@ -468,7 +468,7 @@ def test_doubled_quotes_segv():
     tbl = dedent(
         """
     "ID","TIMESTAMP","addendum_id","bib_reference","bib_reference_url","client_application","client_category","client_sort_key","color","coordsys","creator","creator_did","data_pixel_bitpix","dataproduct_subtype","dataproduct_type","em_max","em_min","format","hips_builder","hips_copyright","hips_creation_date","hips_creation_date_1","hips_creator","hips_data_range","hips_estsize","hips_frame","hips_glu_tag","hips_hierarchy","hips_initial_dec","hips_initial_fov","hips_initial_ra","hips_lon_asc","hips_master_url","hips_order","hips_order_1","hips_order_4","hips_order_min","hips_overlay","hips_pixel_bitpix","hips_pixel_cut","hips_pixel_scale","hips_progenitor_url","hips_publisher","hips_release_date","hips_release_date_1","hips_rgb_blue","hips_rgb_green","hips_rgb_red","hips_sampling","hips_service_url","hips_service_url_1","hips_service_url_2","hips_service_url_3","hips_service_url_4","hips_service_url_5","hips_service_url_6","hips_service_url_7","hips_service_url_8","hips_skyval","hips_skyval_method","hips_skyval_value","hips_status","hips_status_1","hips_status_2","hips_status_3","hips_status_4","hips_status_5","hips_status_6","hips_status_7","hips_status_8","hips_tile_format","hips_tile_format_1","hips_tile_format_4","hips_tile_width","hips_version","hipsgen_date","hipsgen_date_1","hipsgen_date_10","hipsgen_date_11","hipsgen_date_12","hipsgen_date_2","hipsgen_date_3","hipsgen_date_4","hipsgen_date_5","hipsgen_date_6","hipsgen_date_7","hipsgen_date_8","hipsgen_date_9","hipsgen_params","hipsgen_params_1","hipsgen_params_10","hipsgen_params_11","hipsgen_params_12","hipsgen_params_2","hipsgen_params_3","hipsgen_params_4","hipsgen_params_5","hipsgen_params_6","hipsgen_params_7","hipsgen_params_8","hipsgen_params_9","label","maxOrder","moc_access_url","moc_order","moc_release_date","moc_sky_fraction","obs_ack","obs_collection","obs_copyrigh_url","obs_copyright","obs_copyright_1","obs_copyright_url","obs_copyright_url_1","obs_description","obs_description_url","obs_descrition_url","obs_id","obs_initial_dec","obs_initial_fov","obs_initial_ra","obs_provenance","obs_regime","obs_title","ohips_frame","pixelCut","pixelRange","prov_did","prov_progenitor","prov_progenitor_url","publisher_did","publisher_id","s_pixel_scale","t_max","t_min"
-    "CDS/P/2MASS/H","1524123841000","","2006AJ....131.1163S","http://cdsbib.u-strasbg.fr/cgi-bin/cdsbib?2006AJ....131.1163S","AladinDesktop","Image/Infrared/2MASS","04-001-03","","","","ivo://CDS/P/2MASS/H","","","image","1.798E-6","1.525E-6","","Aladin/HipsGen v9.017","CNRS/Unistra","2013-05-06T20:36Z","","CDS (A.Oberto)","","","equatorial","","mean","","","","","","9","","","","","","0 60","2.236E-4","","","2016-04-22T13:48Z","","","","","","http://alasky.u-strasbg.fr/2MASS/H","https://irsa.ipac.caltech.edu/data/hips/CDS/2MASS/H","http://alaskybis.u-strasbg.fr/2MASS/H","https://alaskybis.u-strasbg.fr/2MASS/H","","","","","","","","","public master clonableOnce","public mirror unclonable","public mirror clonableOnce","public mirror clonableOnce","","","","","","jpeg fits","","","512","1.31","","","","","","","","","","","","","","","","","","","","","","","","","","","","","http://alasky.u-strasbg.fr/2MASS/H/Moc.fits","9","","1","University of Massachusetts & IPAC/Caltech","The Two Micron All Sky Survey - H band (2MASS H)","","University of Massachusetts & IPAC/Caltech","","http://www.ipac.caltech.edu/2mass/","","2MASS has uniformly scanned the entire sky in three near-infrared bands to detect and characterize point sources brighter than about 1 mJy in each band, with signal-to-noise ratio (SNR) greater than 10, using a pixel size of 2.0"". This has achieved an 80,000-fold improvement in sensitivity relative to earlier surveys. 2MASS used two highly-automated 1.3-m telescopes, one at Mt. Hopkins, AZ, and one at CTIO, Chile. Each telescope was equipped with a three-channel camera, each channel consisting of a 256x256 array of HgCdTe detectors, capable of observing the sky simultaneously at J (1.25 microns), H (1.65 microns), and Ks (2.17 microns). The University of Massachusetts (UMass) was responsible for the overall management of the project, and for developing the infrared cameras and on-site computing systems at both facilities. The Infrared Processing and Analysis Center (IPAC) is responsible for all data processing through the Production Pipeline, and construction and distribution of the data products. Funding is provided primarily by NASA and the NSF","","","","+0","0.11451621372724685","0","","Infrared","2MASS H (1.66um)","","","","","IPAC/NASA","","","","","51941","50600"
+    "CDS/P/2MASS/H","1524123841000","","2006AJ....131.1163S","http://cdsbib.unistra.fr/cgi-bin/cdsbib?2006AJ....131.1163S","AladinDesktop","Image/Infrared/2MASS","04-001-03","","","","ivo://CDS/P/2MASS/H","","","image","1.798E-6","1.525E-6","","Aladin/HipsGen v9.017","CNRS/Unistra","2013-05-06T20:36Z","","CDS (A.Oberto)","","","equatorial","","mean","","","","","","9","","","","","","0 60","2.236E-4","","","2016-04-22T13:48Z","","","","","","http://alasky.unistra.fr/2MASS/H","https://irsa.ipac.caltech.edu/data/hips/CDS/2MASS/H","http://alaskybis.unistra.fr/2MASS/H","https://alaskybis.unistra.fr/2MASS/H","","","","","","","","","public master clonableOnce","public mirror unclonable","public mirror clonableOnce","public mirror clonableOnce","","","","","","jpeg fits","","","512","1.31","","","","","","","","","","","","","","","","","","","","","","","","","","","","","http://alasky.unistra.fr/2MASS/H/Moc.fits","9","","1","University of Massachusetts & IPAC/Caltech","The Two Micron All Sky Survey - H band (2MASS H)","","University of Massachusetts & IPAC/Caltech","","http://www.ipac.caltech.edu/2mass/","","2MASS has uniformly scanned the entire sky in three near-infrared bands to detect and characterize point sources brighter than about 1 mJy in each band, with signal-to-noise ratio (SNR) greater than 10, using a pixel size of 2.0"". This has achieved an 80,000-fold improvement in sensitivity relative to earlier surveys. 2MASS used two highly-automated 1.3-m telescopes, one at Mt. Hopkins, AZ, and one at CTIO, Chile. Each telescope was equipped with a three-channel camera, each channel consisting of a 256x256 array of HgCdTe detectors, capable of observing the sky simultaneously at J (1.25 microns), H (1.65 microns), and Ks (2.17 microns). The University of Massachusetts (UMass) was responsible for the overall management of the project, and for developing the infrared cameras and on-site computing systems at both facilities. The Infrared Processing and Analysis Center (IPAC) is responsible for all data processing through the Production Pipeline, and construction and distribution of the data products. Funding is provided primarily by NASA and the NSF","","","","+0","0.11451621372724685","0","","Infrared","2MASS H (1.66um)","","","","","IPAC/NASA","","","","","51941","50600"
     """
     )
     ascii.read(tbl, format="csv", fast_reader=True, guess=False)

astropy/io/votable/exceptions.py

@@ -412,7 +412,7 @@ class W06(VOTableSpecWarning):
     """
     This warning is emitted when a ``ucd`` attribute does not match
     the syntax of a `unified content descriptor
-    <http://vizier.u-strasbg.fr/doc/UCD.htx>`__.
+    <https://vizier.unistra.fr/doc/UCD.htx>`__.
 
     If the VOTable version is 1.2 or later, the UCD will also be
     checked to ensure it conforms to the controlled vocabulary defined
@@ -501,7 +501,7 @@ class W11(VOTableSpecWarning):
     """
     Earlier versions of the VOTable specification used a ``gref``
     attribute on the ``LINK`` element to specify a `GLU reference
-    <http://aladin.u-strasbg.fr/glu/>`__.  New files should
+    <http://aladin.unistra.fr/glu/>`__.  New files should
     specify a ``glu:`` protocol using the ``href`` attribute.
 
     Since ``astropy.io.votable`` does not currently support GLU references, it
@@ -1068,7 +1068,7 @@ class W50(VOTableSpecWarning):
     Invalid unit string as defined in the `Units in the VO, Version 1.0
     <https://www.ivoa.net/documents/VOUnits>`_ (VOTable version >= 1.4)
     or `Standards for Astronomical Catalogues, Version 2.0
-    <http://cdsarc.u-strasbg.fr/doc/catstd-3.2.htx>`_ (version < 1.4).
+    <https://cdsarc.cds.unistra.fr/doc/catstd-3.2.htx>`_ (version < 1.4).
 
     Consider passing an explicit ``unit_format`` parameter if the units
     in this file conform to another specification.

astropy/units/cds.py

@@ -3,9 +3,9 @@
 """
 This package defines units used in the CDS format, both the units
 defined in `Centre de Données astronomiques de Strasbourg
-<http://cds.u-strasbg.fr/>`_ `Standards for Astronomical Catalogues 2.0
-<http://vizier.u-strasbg.fr/vizier/doc/catstd-3.2.htx>`_ format and the `complete
-set of supported units <https://vizier.u-strasbg.fr/viz-bin/Unit>`_.
+<https://cds.unistra.fr/>`_ `Standards for Astronomical Catalogues 2.0
+<https://vizier.unistra.fr/vizier/doc/catstd-3.2.htx>`_ format and the `complete
+set of supported units <https://vizier.unistra.fr/viz-bin/Unit>`_.
 This format is used by VOTable up to version 1.2.
 
 These units are not available in the top-level `astropy.units`
@@ -43,7 +43,7 @@ def _initialize_module():
     prefixes = [(short, short, factor) for (short, long, factor) in prefixes]
 
     # The following units are defined in alphabetical order, directly from
-    # here: https://vizier.u-strasbg.fr/viz-bin/Unit
+    # here: https://vizier.unistra.fr/viz-bin/Unit
 
     mapping = [
         (["A"], u.A, "Ampere"),

astropy/units/format/cds.py

@@ -25,10 +25,10 @@
 class CDS(Base):
     """
     Support the `Centre de Données astronomiques de Strasbourg
-    <http://cds.u-strasbg.fr/>`_ `Standards for Astronomical
-    Catalogues 2.0 <http://vizier.u-strasbg.fr/vizier/doc/catstd-3.2.htx>`_
+    <https://cds.unistra.fr/>`_ `Standards for Astronomical
+    Catalogues 2.0 <https://vizier.unistra.fr/vizier/doc/catstd-3.2.htx>`_
     format, and the `complete set of supported units
-    <https://vizier.u-strasbg.fr/viz-bin/Unit>`_.  This format is used
+    <https://vizier.unistra.fr/viz-bin/Unit>`_.  This format is used
     by VOTable up to version 1.2.
     """
 
@@ -139,7 +139,7 @@ def _make_parser(cls):
         """
         The grammar here is based on the description in the `Standards
         for Astronomical Catalogues 2.0
-        <http://vizier.u-strasbg.fr/vizier/doc/catstd-3.2.htx>`_, which is not
+        <https://vizier.unistra.fr/vizier/doc/catstd-3.2.htx>`_, which is not
         terribly precise.  The exact grammar is here is based on the
         YACC grammar in the `unity library <https://purl.org/nxg/dist/unity/>`_.
         """

docs/changes/14681.other.rst

@@ -0,0 +1 @@
+Updated CDS URL for Sesame look-up as the old URL is deprecated.

docs/coordinates/index.rst

@@ -280,7 +280,7 @@ Or cross-matching catalog coordinates (detailed in
 The `astropy.coordinates` sub-package also provides a quick way to get
 coordinates for named objects, assuming you have an active internet
 connection. The `~astropy.coordinates.SkyCoord.from_name` method of |SkyCoord|
-uses `Sesame <http://cds.u-strasbg.fr/cgi-bin/Sesame>`_ to retrieve coordinates
+uses `Sesame <https://cds.unistra.fr/cgi-bin/Sesame>`_ to retrieve coordinates
 for a particular named object.
 
 ..

docs/coordinates/remote_methods.rst

@@ -6,7 +6,7 @@ Usage Tips/Suggestions for Methods That Access Remote Resources
 There are currently two methods that rely on getting remote data to work.
 
 The first is the :class:`~astropy.coordinates.SkyCoord` :meth:`~astropy.coordinates.SkyCoord.from_name` method, which uses
-`Sesame <http://cds.u-strasbg.fr/cgi-bin/Sesame>`_ to retrieve coordinates
+`Sesame <https://cds.unistra.fr/cgi-bin/Sesame>`_ to retrieve coordinates
 for a particular named object::
 
     >>> from astropy.coordinates import SkyCoord

docs/coordinates/spectralcoord.rst

@@ -253,7 +253,7 @@ For the target, the simplest way is to use the |SkyCoord| class::
 
 In this case we specified a radial velocity and a distance for the target (using
 the `T Tauri SIMBAD entry
-<http://simbad.u-strasbg.fr/simbad/sim-id?Ident=T+Tauri>`_, but it is also
+<https://simbad.unistra.fr/simbad/sim-id?Ident=T+Tauri>`_, but it is also
 possible to not specify these, which means the target is assumed to be
 stationary in the frame in which it is observed, and are assumed to be at large
 distance from the Sun (such that any parallax effects would be unimportant if

docs/io/ascii/extension_classes.rst

@@ -13,7 +13,7 @@ well-defined but idiosyncratic formats.
 
 * :class:`~astropy.io.ascii.AASTex`: AASTeX `deluxetable <https://fits.gsfc.nasa.gov/standard30/deluxetable.sty>`_ used for AAS journals.
 * :class:`~astropy.io.ascii.Basic`: basic table with customizable delimiters and header configurations.
-* :class:`~astropy.io.ascii.Cds`: `CDS format table <http://vizier.u-strasbg.fr/doc/catstd.htx>`_ (also Vizier and ApJ machine readable tables).
+* :class:`~astropy.io.ascii.Cds`: `CDS format table <https://vizier.unistra.fr/doc/catstd.htx>`_ (also Vizier and ApJ machine readable tables).
 * :class:`~astropy.io.ascii.CommentedHeader`: column names given in a line that begins with the comment character.
 * :class:`~astropy.io.ascii.Csv`: comma-separated values.
 * :class:`~astropy.io.ascii.Daophot`: table from the IRAF DAOphot package.

docs/io/ascii/index.rst

@@ -19,7 +19,7 @@ The following shows a few of the ASCII formats that are available, while the
 section on `Supported formats`_ contains the full list.
 
 * :class:`~astropy.io.ascii.Basic`: basic table with customizable delimiters and header configurations
-* :class:`~astropy.io.ascii.Cds`: `CDS format table <http://vizier.u-strasbg.fr/doc/catstd.htx>`_ (also Vizier)
+* :class:`~astropy.io.ascii.Cds`: `CDS format table <https://vizier.unistra.fr/doc/catstd.htx>`_ (also Vizier)
 * :class:`~astropy.io.ascii.Daophot`: table from the IRAF DAOphot package
 * :class:`~astropy.io.ascii.Ecsv`: :ref:`ecsv_format` for lossless round-trip of data tables (**recommended**)
 * :class:`~astropy.io.ascii.FixedWidth`: table with fixed-width columns (see also :ref:`fixed_width_gallery`)

docs/io/ascii/write.rst

@@ -238,7 +238,7 @@ Machine-Readable Table Format
 The American Astronomical Society Journals' `Machine-Readable Table (MRT)
 <https://journals.aas.org/mrt-standards/>`_ format consists of single file with
 the table description header and the table data itself. MRT is similar to the
-`CDS <http://vizier.u-strasbg.fr/doc/catstd.htx>`_ format standard, but differs
+`CDS <https://vizier.unistra.fr/doc/catstd.htx>`_ format standard, but differs
 in the table description sections and the lack of a separate ``ReadMe`` file.
 Astropy does not support writing in the CDS format.
 

docs/samp/example_clients.rst

@@ -8,7 +8,7 @@ Communication between Integrated Clients Objects
 
 As shown in :doc:`example_table_image`, the |SAMPIntegratedClient| class can be
 used to communicate with other SAMP-enabled tools such as `TOPCAT`_,
-`SAO DS9 <http://ds9.si.edu/>`_, or `Aladin Desktop <http://aladin.u-strasbg.fr>`_.
+`SAO DS9 <http://ds9.si.edu/>`_, or `Aladin Desktop <https://aladin.unistra.fr>`_.
 
 In this section, we look at how we can set up two |SAMPIntegratedClient|
 instances and communicate between them.

docs/samp/example_hub.rst

@@ -12,7 +12,7 @@ Using an Existing Hub
 
 You can start up another application that includes a hub, such as
 `TOPCAT`_, `SAO DS9 <http://ds9.si.edu/>`_, or
-`Aladin Desktop <http://aladin.u-strasbg.fr>`_.
+`Aladin Desktop <https://aladin.unistra.fr>`_.
 
 Using the Command-Line Hub Utility
 ==================================

docs/samp/example_table_image.rst

@@ -10,7 +10,7 @@ In the following examples, we make use of:
 * `TOPCAT`_, which is a tool to explore tabular data.
 * `SAO DS9 <http://ds9.si.edu/>`_, which is an image
   visualization tool that can overplot catalogs.
-* `Aladin Desktop <http://aladin.u-strasbg.fr>`_, which is another tool that
+* `Aladin Desktop <https://aladin.unistra.fr>`_, which is another tool that
   can visualize images and catalogs.
 
 TOPCAT and Aladin will run a SAMP Hub if none is found, so for the following

docs/samp/index.rst

@@ -14,7 +14,7 @@ computer, to communicate with each other by exchanging short messages that may
 reference external data files. The protocol has been developed within the
 International Virtual Observatory Alliance (IVOA) and is understood by many
 desktop astronomy tools, including `TOPCAT`_, `SAO DS9 <http://ds9.si.edu/>`_,
-and `Aladin <http://aladin.u-strasbg.fr>`_.
+and `Aladin <https://aladin.unistra.fr>`_.
 
 So by using the classes in `astropy.samp`, Python code can interact with
 other running desktop clients, for instance displaying a named FITS file in DS9,

docs/table/io.rst

@@ -32,7 +32,7 @@ method with the name of the file and the file format, for instance
     >>> t = Table.read('photometry.dat', format='ascii.daophot')
 
 It is possible to load tables directly from the Internet using URLs. For
-example, download tables from `VizieR catalogs <https://vizier.u-strasbg.fr/>`_
+example, download tables from `VizieR catalogs <https://vizier.unistra.fr/>`_
 in CDS format (``'ascii.cds'``)::
 
     >>> t = Table.read("ftp://cdsarc.u-strasbg.fr/pub/cats/VII/253/snrs.dat",