Skip to content

Commit e5fa8f6

Browse files
committed
Read TAP_URL from environment var
1 parent 0d2a717 commit e5fa8f6

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

astroquery/eso/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
ESO service.
44
"""
55
from astropy import config as _config
6-
import os
76

87

98
class Conf(_config.ConfigNamespace):
@@ -20,9 +19,7 @@ class Conf(_config.ConfigNamespace):
2019
tap_url = _config.ConfigItem(
2120
"https://archive.eso.org/tap_obs",
2221
'URL for TAP queries.')
23-
tap_url_dev = _config.ConfigItem(
24-
os.environ['TAP_URL_DEV'],
25-
'URL for TAP development server.')
22+
2623

2724
conf = Conf()
2825

astroquery/eso/core.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import base64
1212
import email
1313
import json
14+
import os
1415
import os.path
1516
import pickle
1617
import re
@@ -109,7 +110,14 @@ def timeout(self, value):
109110
def tap_url() -> str:
110111
url = conf.tap_url
111112
if EsoClass.USE_DEV_TAP:
112-
url = conf.tap_url_dev
113+
try:
114+
url = os.environ['TAP_URL']
115+
except KeyError as e:
116+
raise EnvironmentError(
117+
"Running on dev mode, but TAP_URL environment variable is not set"
118+
) from e
119+
logmsg = f"Using dev tap url: {url}"
120+
log.info(logmsg)
113121
return url
114122

115123
def request_file(self, query_str: str):

0 commit comments

Comments
 (0)