Merge pull request #2881 from xuanxu/avoid-url-redirects

Update URLs

CONTRIBUTING.rst

@@ -3,7 +3,7 @@ Contributing to Astroquery
 The first official release of astroquery occurred in September 2013.
 
 Please see `astropy's contributing guildelines
-<http://www.astropy.org/contribute.html>`__ for a general guide to the
+<https://www.astropy.org/contribute.html>`__ for a general guide to the
 workflow involving git, etc.  Everything below is astroquery-specific.
 
 We strongly encourage draft pull requests to be opened early in development.
@@ -73,4 +73,4 @@ handling.
 
 .. _astroquery API: docs/api.rst
 .. _template: docs/template.rst
-.. _requests: http://docs.python-requests.org/en/master/
+.. _requests: https://docs.python-requests.org/en/latest/

README.rst

@@ -25,7 +25,7 @@
 Accessing Online Astronomical Data
 ==================================
 
-Astroquery is an `astropy <http://www.astropy.org>`_ affiliated package that
+Astroquery is an `astropy <https://www.astropy.org>`_ affiliated package that
 contains a collection of tools to access online Astronomical data. Each web
 service has its own sub-package. For example, to interface with the `SIMBAD
 website <https://simbad.cds.unistra.fr/simbad/>`_, use the ``simbad`` sub-package:
@@ -47,12 +47,12 @@ As an `astropy`_ affiliate, astroquery requires `astropy`_ version 4.2.1 or late
 
 astroquery uses the `requests <https://requests.readthedocs.io/en/latest/>`_
 module to communicate with the internet.  `BeautifulSoup
-<http://www.crummy.com/software/BeautifulSoup/>`_ and `html5lib'
+<https://www.crummy.com/software/BeautifulSoup/>`_ and `html5lib'
 <https://html5lib.readthedocs.io/en/latest/>`_ are needed for HTML parsing for
 some services.  The `keyring <https://pypi.python.org/pypi/keyring>`_ module is
 also required for accessing services that require a login.  These can all be
 installed using `pip <https://pypi.python.org/pypi/pip>`_ or `anaconda
-<http://continuum.io/>`_.  Running the tests requires `curl
+<https://www.anaconda.com/>`_.  Running the tests requires `curl
 <https://curl.haxx.se/>`_ to be installed.
 
 The latest version of astroquery can be pip installed (note the ``--pre`` for
@@ -107,7 +107,7 @@ Citing Astroquery
 -----------------
 
 If you use ``astroquery``, please cite the paper we published in `The
-Astronomical Journal <http://adsabs.harvard.edu/abs/2019AJ....157...98G>`__.
+Astronomical Journal <https://adsabs.harvard.edu/abs/2019AJ....157...98G>`__.
 
 The BibTeX entry is available from the package itself::
 
@@ -133,8 +133,8 @@ Maintained by `Adam Ginsburg`_ and `Brigitta Sipocz <https://github.com/bsipocz>
 .. _Download Stable ZIP: https://github.com/astropy/astroquery/zipball/stable
 .. _Download Stable TAR: https://github.com/astropy/astroquery/tarball/stable
 .. _View on Github: https://github.com/astropy/astroquery/
-.. _Documentation: http://astroquery.readthedocs.io
+.. _Documentation: https://astroquery.readthedocs.io
 .. _[email protected]: mailto:[email protected]
-.. _Adam Ginsburg: http://www.adamgginsburg.com
+.. _Adam Ginsburg: https://www.adamgginsburg.com
 .. _Blog: http://astropy.org/astroquery-blog
-.. _API: http://astroquery.readthedocs.io/en/latest/api.html
+.. _API: https://astroquery.readthedocs.io/en/latest/api.html

ah_bootstrap.py

@@ -846,7 +846,7 @@ def run_cmd(cmd):
     except ValueError:
         # Due to an OSX oddity locale.getdefaultlocale() can also crash
         # depending on the user's locale/language settings.  See:
-        # http://bugs.python.org/issue18378
+        # https://bugs.python.org/issue18378
         stdio_encoding = 'latin1'
 
     # Unlikely to fail at this point but even then let's be flexible

astroquery/CITATION

@@ -26,6 +26,6 @@ archivePrefix = "arXiv",
       eid = {98},
     pages = {98},
       doi = {10.3847/1538-3881/aafc33},
-   adsurl = {http://adsabs.harvard.edu/abs/2019AJ....157...98G},
+   adsurl = {https://adsabs.harvard.edu/abs/2019AJ....157...98G},
   adsnote = {Provided by the SAO/NASA Astrophysics Data System}
 }

astroquery/alma/core.py

@@ -1021,7 +1021,7 @@ def get_cycle0_uid_contents(self, uid):
         List the file contents of a UID from Cycle 0.  Will raise an error
         if the UID is from cycle 1+, since those data have been released in
         a different and more consistent format.  See
-        http://almascience.org/documents-and-tools/cycle-2/ALMAQA2Productsv1.01.pdf
+        https://almascience.org/documents-and-tools/cycle-2/ALMAQA2Productsv1.01.pdf
         for details.
         """
 

astroquery/atomic/core.py

@@ -147,7 +147,7 @@ def query_object(self, *, wavelength_range=None, wavelength_type=None, wavelengt
 
         References
         ----------
-        .. [1] http://www.pa.uky.edu/~peter/atomic/instruction.html
+        .. [1] https://linelist.pa.uky.edu/atomic/instruction.html
         """
         response = self.query_object_async(
             wavelength_range=wavelength_range, wavelength_type=wavelength_type,

astroquery/besancon/__init__.py

@@ -3,7 +3,7 @@
 Besancon Query Tool
 -------------------
 A tool to query the Besancon model of the galaxy
-http://model.obs-besancon.fr/
+https://model.obs-besancon.fr/
 
 :Author: Adam Ginsburg ([email protected])
 """
@@ -21,7 +21,7 @@ class Conf(_config.ConfigNamespace):
          ],
         'Besancon download URL.  Changed to modele2003 in 2013.')
     model_form = _config.ConfigItem(
-        ['http://model.obs-besancon.fr/modele_form.php'],
+        ['https://model.obs-besancon.fr/modele_form.php'],
         'Besancon model form URL')
     ping_delay = _config.ConfigItem(
         30.0,

astroquery/besancon/core.py

@@ -182,7 +182,7 @@ def _parse_args(self, glon, glat, email, *, smallfield=True, extinction=0.7,
         """
         Perform a query on the Besancon model of the galaxy.
 
-        http://model.obs-besancon.fr/
+        https://model.obs-besancon.fr/
 
         Parameters
         ----------

astroquery/cadc/tests/test_cadctap.py

@@ -368,7 +368,7 @@ def __init__(self, **param_dict):
 def test_exec_sync(tmp_path):
     # save results in a file
     # create the VOTable result
-    # example from http://docs.astropy.org/en/stable/io/votable/
+    # example from https://docs.astropy.org/en/stable/io/votable/
     votable = VOTableFile()
     resource = Resource()
     votable.resources.append(resource)

astroquery/cds/__init__.py

@@ -7,8 +7,8 @@
 
 This package is for querying the CDS MOC service, primarily hosted at:
 
-* http://alasky.unistra.fr/MocServer/query
-* http://alaskybis.unistra.fr/MocServer/query (mirror)
+* https://alasky.unistra.fr/MocServer/query
+* https://alaskybis.unistra.fr/MocServer/query (mirror)
 
 Note: If the access to MOCs with the MOCServer tool was helpful for your research
 work, the following acknowledgment would be appreciated::

astroquery/query.py

@@ -316,7 +316,7 @@ def _request(self, method, url,
             Optional, if specified, overrides global cache settings.
         verify : bool
             Verify the server's TLS certificate?
-            (see http://docs.python-requests.org/en/master/_modules/requests/sessions/?highlight=verify)
+            (see https://docs.python-requests.org/en/master/_modules/requests/sessions/?highlight=verify)
         continuation : bool
             If the file is partly downloaded to the target location, this
             parameter will try to continue the download where it left off.

astroquery/utils/process_asyncs.py

@@ -13,7 +13,7 @@ def async_to_sync(cls):
     Convert all query_x_async methods to query_x methods
 
     (see
-    http://stackoverflow.com/questions/18048341/add-methods-to-a-class-generated-from-other-methods
+    https://stackoverflow.com/questions/18048341/add-methods-to-a-class-generated-from-other-methods
     for help understanding)
     """
 

astroquery/utils/timer.py

@@ -308,7 +308,7 @@ def plot(self, *, xscale='linear', yscale='linear', xlabeltext='args',
              save_as=''):  # pragma: no cover
         """Plot prediction.
 
-        .. note:: Uses `matplotlib <http://matplotlib.org/>`_.
+        .. note:: Uses `matplotlib <https://matplotlib.org/>`_.
 
         Parameters
         ----------

docs/index.rst

@@ -2,7 +2,7 @@ Astroquery
 ==========
 
 This is the documentation for the Astroquery coordinated package of `astropy
-<http://www.astropy.org>`__.
+<https://www.astropy.org>`__.
 
 Code and issue tracker are on `GitHub <https://github.com/astropy/astroquery>`_.
 
@@ -99,8 +99,8 @@ Astroquery works with Python 3.7 or later.
 
 The following packages are required for astroquery installation & use:
 
-* `numpy <http://www.numpy.org>`_ >= 1.18
-* `astropy <http://www.astropy.org>`__ (>=4.2.1)
+* `numpy <https://numpy.org>`_ >= 1.18
+* `astropy <https://www.astropy.org>`__ (>=4.2.1)
 * `pyVO`_ (>=1.1)
 * `requests <https://requests.readthedocs.io/en/latest/>`_
 * `keyring <https://pypi.python.org/pypi/keyring>`_

docs/template.rst

@@ -7,4 +7,4 @@ module for a new online service.
    :language: python
 
 
-.. _Madhura Parikh: http://github.com/jdnc
+.. _Madhura Parikh: https://github.com/jdnc