Merge branch 'main' of https://github.com/astropy/astroquery

Author: volodymyrss

.github/workflows/ci_tests.yml

@@ -3,12 +3,12 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
     tags:
     - '*'
   pull_request:
     branches:
-    - master
+    - main
   schedule:
     # run every Monday at 5am UTC
     - cron: '0 5 * * 1'

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   analyze:

CHANGES.rst

@@ -1,76 +1,111 @@
-0.4.2 (unreleased)
+0.4.3 (unreleased)
 ==================
 
+New Tools and Services
+----------------------
+
+
 Service fixes and enhancements
 ------------------------------
 
+
+
+0.4.2 (2021-05-14)
+==================
+
+New Tools and Services
+----------------------
+
 cds.hips2fits
 ^^^^^^^^^^^^^
 
-- HIPS2fits is a service providing nice fits/jpg/png image cutouts from a HiPS + a WCS. It can now be queried from python [#1734]
+- New module HIPS2fits to provide access to fits/jpg/png image cutouts from a
+  HiPS + a WCS. [#1734]
 
-
-esa/iso
+esa.iso
 ^^^^^^^
 
-- New module to access ESA ISO mission [#1914]
+- New module to access ESA ISO mission. [#1914]
 
-ESASky
+esa.xmm_newton
+^^^^^^^^^^^^^^
+
+- New method ``get_epic_images`` is added to extract EPIC images from
+  tarballs. [#1759]
+
+- New method ``get_epic_metadata`` is added to download EPIC sources
+  metadata. [#1814]
+
+mast
 ^^^^
 
-- All ESASky spectra now accessible. [#1909]
+- Added Zcut functionality to astroquery [#1911]
 
-- Updated ESASky module for version 3.5 of ESASky backend. [#1858]
+svo_fps
+^^^^^^^
 
-- Added row limit parameter for map queries. [#1858]
+- New module to access the Spanish Virtual Observatory Filter Profile List. [#1498]
 
 
-irsa
+Service fixes and enhancements
+------------------------------
+
+alma
 ^^^^
 
-- Used more specific exceptions in IRSA. [#1854]
+- The archive query interface has been deprecated in favour of
+  VirtualObservatory (VO) services such as TAP, ObsCore etc. The alma
+  library has been updated accordingly. [#1689]
 
+- ALMA queries using string representations will now convert to appropriate
+  coordinates before being sent to the server; previously they were treated as
+  whatever unit they were presented in.  [#1867]
 
-mast
-^^^^
+- Download mechanism uses the ALMA Datalink service that allows exploring and
+  downloading entire tarball package files or just part of their
+  content. [#1820]
 
-- Added ``Observations.download_file`` method to download a single file from MAST given an input
-  data URI. [#1825]
-- Added case for passing a row to ``Observations.download_file` [#1881]
-- Removed deprecated ``Observations.get_hst_s3_uris()``, ``Observations.get_hst_s3_uri()``, 
-  ``Core.get_token()``, ``Core.enable_s3_hst_dataset()``, ``Core.disable_s3_hst_dataset()`` and 
-  variables obstype and silent [#1884]
-- Added Zcut functionality to astroquery [#1911]
-- Fixed error causing empty products passed to ``Observations.get_product_list()`` to yeild a
-  non-empty result. [#1921]
-- Changed AWS cloud access from RequesterPays to anonymous acces [#1980]
-- Fixed error with download of Spitzer data [#1994]
+- Fixed bug in ``get_data_info`` to ensure relevant fields are strings. [#2022]
 
-esa/hubble
+esa.esasky
+^^^^^^^^^^
+
+- All ESASky spectra now accessible. [#1909]
+
+- Updated ESASky module for version 3.5 of ESASky backend. [#1858]
+
+- Added row limit parameter for map queries. [#1858]
+
+esa.hubble
 ^^^^^^^^^^
 
 - Module added to query eHST TAP based on a set of specific criteria and
   asynchronous jobs are now supported. [#1723]
 
-esa/xmm_newton
-^^^^^^^^^^^^^^
+gaia
+^^^^
+- Fixed RA/dec table edit capability. [#1784]
 
-- new method ``get_epic_images`` is added to extract EPIC images from
-  tarballs. [#1759]
+- Changed file names handling when downloading data. [#1784]
 
-esasky
+- Improved code to handle bit data type. [#1784]
+
+- Prepared code to handle new datalink products. [#1784]
+
+gemini
 ^^^^^^
 
-- Converted unittest styled tests to pytest. [#1862]
+- ``login()`` method to support authenticated sessions to the GOA. [#1780]
 
+- ``get_file()`` to support downloading files. [#1780]
 
-Gemini
-^^^^^^
+- fix syntax error in ``query_criteria()`` [#1823]
 
-- login() support for authenticated sessions to the GOA [#1778]
-- get_file() support for downloading files [#1778]
-- fix syntax error in query_criteria() [#1823]
+- If QA and/or engineering parameters are explicitly passed, remove the
+  defaults of ``notengineering`` and/or ``NotFail``. [#2000]
 
+- Smarter defaulting of radius to None unless coordinates are specified, in
+  which case defaults to 0.3 degrees. [#1995]
 
 heasarc
 ^^^^^^^
@@ -80,62 +115,81 @@ heasarc
 - Add alternative instance of HEASARC Server, maintainer by 
   INTEGRAL Science Data Center [#1988]
 
+irsa
+^^^^
+
+- Used more specific exceptions in IRSA. [#1854]
 
-SVO FPS
+jplsbdb
 ^^^^^^^
 
-- Module added to access the Spanish Virtual Observatory Filter Profile List [#1498]
+- Returns astropy quantities, rather than scaled units. [#2011]
+
+lcogt
+^^^^^
+
+- Module has been removed after having been defunct due to upstream API
+  refactoring a few years ago. [#2071]
+
+mast
+^^^^
+
+- Added ``Observations.download_file`` method to download a single file from
+  MAST given an input data URI. [#1825]
+
+- Added case for passing a row to ``Observations.download_file``. [#1881]
+
+- Removed deprecated methods: ``Observations.get_hst_s3_uris()``,
+  ``Observations.get_hst_s3_uri()``, ``Core.get_token()``,
+  ``Core.enable_s3_hst_dataset()``, ``Core.disable_s3_hst_dataset()``; and
+  parameters: ``obstype`` and ``silent``. [#1884]
+
+- Fixed error causing empty products passed to ``Observations.get_product_list()``
+  to yeild a non-empty result. [#1921]
+
+- Changed AWS cloud access from RequesterPays to anonymous acces. [#1980]
+
+- Fixed error with download of Spitzer data. [#1994]
+
+sdss
+^^^^
+
+- Fix validation of field names. [#1790]
 
-Splatalogue
+splatalogue
 ^^^^^^^^^^^
 
-- The Splatalogue ID querying is now properly cached in the `astropy` cache
-  directory (Issue [#423]) The scraping function has also been updated to reflect
+- The Splatalogue ID querying is now properly cached in the astropy cache
+  directory. The scraping function has also been updated to reflect
   the Splatalogue webpage. [#1772]
 
 - The splatalogue URL has changed to https://splatalogue.online, as the old site
   stopped functioning in September 2020 [#1817]
 
-UKIDSS
-^^^^^^
-
-- Updated to ``UKIDSSDR11PLUS`` as the default version [#1767]
-
-utils/tap
+ukidss
 ^^^^^^
 
-- Converted unittest styled tests to pytest. [#1862]
-
-alma
-^^^^
+- Updated to ``UKIDSSDR11PLUS`` as the default data release. [#1767]
 
-- The archive query interface has been deprecated in favour of
-  VirtualObservatory (VO) services such as TAP, ObsCore etc. The alma
-  library has been updated accordingly. [#1689]
-- ALMA queries using string representations will now convert to appropriate
-  coordinates before being sent to the server; previously they were treated as
-  whatever unit they were presented in.  [#1867]
-- Download mechanism uses the ALMA Datalink service that allows exploring and
-  downloading entire tarball package files or just part of their content. [#1820]
+vamdc
+^^^^^
 
-gaia
-^^^^
-- Fixed RA/dec table edit capability. [#1784]
-- Changed file names handling when downloading data. [#1784]
-- Improved code to handle bit data type. [#1784]
-- Prepared code to handle new datalink products. [#1784]
+- Deprecate module due to upstream library dependence and compability
+  issues. [#2070]
 
-esa.xmm_newton
-^^^^^^^^^^^^^^
+vizier
+^^^^^^
 
-- Added new function to download EPIC sources metadate. [#1814]
+- Refactor module to support list of coordinates as well as several fixes to
+  follow changes in upstream API. [#2012]
 
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 
 - HTTP requests and responses can now be logged when the astropy
   logger is set to level "DEBUG" and "TRACE" respectively. [#1992]
+
 - Astroquery and all its modules now uses a logger similar to Astropy's. [#1992]
 
 

README.rst

@@ -12,7 +12,7 @@
     :target: https://github.com/astropy/astroquery/actions?query=workflow%3ACI
     :alt: Github Actions CI Status
 
-.. image:: https://codecov.io/gh/astropy/astroquery/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/astropy/astroquery/branch/main/graph/badge.svg
     :target: https://codecov.io/gh/astropy/astroquery
     :alt: Coverage results
 
@@ -67,11 +67,11 @@ or pip installed:
 
     $ pip install --pre astroquery
 
-and the 'bleeding edge' master version:
+and the 'bleeding edge' main version:
 
 .. code-block:: bash
 
-   $ pip install https://github.com/astropy/astroquery/archive/master.zip
+   $ pip install https://github.com/astropy/astroquery/archive/main.zip
 
 or cloned and installed from source:
 
@@ -96,7 +96,7 @@ and `query_region`.
 To report bugs and request features, please use the issue tracker.  Code
 contributions are very welcome, though we encourage you to follow the `API`_
 and `contributing guidelines
-<https://github.com/astropy/astroquery/blob/master/CONTRIBUTING.rst>`_ as much
+<https://github.com/astropy/astroquery/blob/main/CONTRIBUTING.rst>`_ as much
 as possible.
 
 List of Modules
@@ -182,8 +182,8 @@ Additional Links
 Maintained by `Adam Ginsburg`_ and `Brigitta Sipocz <https://github.com/bsipocz>`_ (`[email protected]`_)
 
 
-.. _Download Development ZIP: https://github.com/astropy/astroquery/zipball/master
-.. _Download Development TAR: https://github.com/astropy/astroquery/tarball/master
+.. _Download Development ZIP: https://github.com/astropy/astroquery/zipball/main
+.. _Download Development TAR: https://github.com/astropy/astroquery/tarball/main
 .. _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/

astroquery/_astropy_init.py

@@ -25,36 +25,9 @@
 
 if not _ASTROPY_SETUP_:  # noqa
     import os
-    from warnings import warn
-    from astropy.config.configuration import (
-        update_default_config,
-        ConfigurationDefaultMissingError,
-        ConfigurationDefaultMissingWarning)
 
     # Create the test function for self test
     from astropy.tests.runner import TestRunner
     test = TestRunner.make_test_runner_in(os.path.dirname(__file__))
     test.__test__ = False
     __all__ += ['test']
-
-    # add these here so we only need to cleanup the namespace at the end
-    config_dir = None
-
-    if not os.environ.get('ASTROPY_SKIP_CONFIG_UPDATE', False):
-        config_dir = os.path.dirname(__file__)
-        config_template = os.path.join(config_dir, __package__ + ".cfg")
-        if os.path.isfile(config_template):
-            try:
-                update_default_config(
-                    __package__, config_dir, version=__version__)
-            except TypeError as orig_error:
-                try:
-                    update_default_config(__package__, config_dir)
-                except ConfigurationDefaultMissingError as e:
-                    wmsg = (e.args[0] +
-                            " Cannot install default profile. If you are "
-                            "importing from source, this is expected.")
-                    warn(ConfigurationDefaultMissingWarning(wmsg))
-                    del e
-                except Exception:
-                    raise orig_error

astroquery/alma/core.py

@@ -634,8 +634,8 @@ def get_data_info(self, uids, expand_tarfiles=False,
                 result = vstack([result, expanded_result], join_type='exact')
         else:
             result = result[np.logical_or(np.core.defchararray.find(
-                result['semantics'], DATALINK_SEMANTICS) == -1,
-                result['content_type'] != DATALINK_FILE_TYPE)]
+                result['semantics'].astype(str), DATALINK_SEMANTICS) == -1,
+                result['content_type'].astype(str) != DATALINK_FILE_TYPE)]
 
         return result
 

astroquery/alma/tests/setup_package.py

@@ -5,5 +5,5 @@
 
 
 def get_package_data():
-    paths = [os.path.join('data', '*.txt')]
+    paths = [os.path.join('data', '*.txt'), os.path.join('data', '*.xml')]
     return {'astroquery.alma.tests': paths}