Skip to content

eHST queries and data using TAP and minor fixes in ESA modules #2597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 26, 2022
Merged

eHST queries and data using TAP and minor fixes in ESA modules #2597

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dcc881f
EHSTPCR-1071: correct tapplus and data distribution
jespinosaar Nov 23, 2022
ac39c9c
Fix for #2590
jespinosaar Nov 23, 2022
462ea9b
Custom client_id in TapPlus
jespinosaar Nov 23, 2022
023eaec
Fixes in remote tests
jespinosaar Nov 23, 2022
22a15e7
EHSTPCR-1071: style fixes
jespinosaar Nov 23, 2022
7aa111c
changes.rst file updated
jespinosaar Nov 23, 2022
7180126
EHSTPCR-1071: fix in test cov
jespinosaar Nov 23, 2022
0001244
eHST: tests and doc updated, kwargs methods
jespinosaar Nov 24, 2022
f417fc0
eJWST: format improvements
jespinosaar Nov 24, 2022
d126fd9
eHST: pycodestyle issues with unused dependencies
jespinosaar Nov 24, 2022
11fcb7c
eHST: remove warning in deprecated method, tap_client as variable
jespinosaar Nov 24, 2022
3569a03
TAP_CLIENT_ID replaced with tap.tap_client_id
jespinosaar Nov 24, 2022
141ce72
TAP_CLIENT_ID removed
jespinosaar Nov 24, 2022
d5221e5
HSC version removed in docs
jespinosaar Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ esa.hubble
- Refactored query_criteria to use ehst.archive table therefore making the query
a lot faster. [#2524]

- Update TAP url to avoid 301 HTTPError. [#2567]
- Update to TAP url to query data and download files, aligned with the new eHST Science Archive. [#2567][#2597]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more changelog entries are needed for this PR to cover the various changes, see the comments below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changelog entries added. Please let me know if you think more are required.



alma
Expand Down
27 changes: 11 additions & 16 deletions astroquery/esa/hubble/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""
@author: Javier Duran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reminds me that we need to sort out a team page listing ESA as a significant contributor. It's not forgotten, we just haven't got to it yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks! just ping me if you need a list of users or something else.

@contact: [email protected]
==========
eHST Init
==========
European Space Astronomy Centre (ESAC)
European Space Agency (ESA)
Created on 13 Aug. 2018
"""

from astropy import config as _config
from astropy.config import paths
import os


class Conf(_config.ConfigNamespace):
"""
Configuration parameters for `astroquery.esa.hubble`.
"""
DATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
"ehst-sl-server/servlet/data-action",
"Main url for retriving hst files")
METADATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
"ehst-sl-server/servlet/"
"metadata-action",
"Main url for retriving hst metadata")
TARGET_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
"ehst-sl-server/servlet/"
"targetresolver-action",
"Main url for solving targets")
EHST_TAP_SERVER = _config.ConfigItem("https://hst.esac.esa.int/tap-server/tap", "eHST TAP Server")
EHST_TARGET_ACTION = _config.ConfigItem("servlet/target-resolver?", "eHST Target Resolver")
EHST_MESSAGES = _config.ConfigItem("notification?action=GetNotifications", "eHST Messages")
TIMEOUT = 60

cache_location = os.path.join(paths.get_cache_dir(), 'astroquery/ehst', )


conf = Conf()

Expand Down
Loading