Skip to content

Commit b887f73

Browse files
committed
Remove env var tap url
1 parent 2d5584c commit b887f73

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

astroquery/eso/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def ROW_LIMIT(self, value):
140140
self._ROW_LIMIT = mr
141141

142142
def _tap_url(self) -> str:
143-
url = os.environ.get('ESO_TAP_URL', conf.tap_url)
143+
url = conf.tap_url
144144
return url
145145

146146
def _authenticate(self, *, username: str, password: str) -> bool:

astroquery/eso/tests/test_eso.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -258,31 +258,10 @@ def test_calselector_multipart(monkeypatch, tmp_path):
258258

259259

260260
def test_tap_url():
261-
tap_url_env_var = "ESO_TAP_URL"
262-
tmpvar = None
263-
dev_url = "dev_url"
264261
prod_url = "https://archive.eso.org/tap_obs"
265-
266-
# ESO_TAP_URL shouldn't be set to start the test
267-
try:
268-
tmpvar = os.environ[tap_url_env_var]
269-
del os.environ[tap_url_env_var]
270-
except KeyError:
271-
pass
272-
273262
eso_instance = Eso()
274-
275-
# ESO_TAP_URL not set
276263
assert eso_instance._tap_url() == prod_url
277264

278-
# ESO_TAP_URL set
279-
os.environ[tap_url_env_var] = dev_url
280-
assert eso_instance._tap_url() == dev_url
281-
282-
# set again the env vars, in case we deleted it earlier
283-
if tmpvar:
284-
os.environ[tap_url_env_var] = tmpvar
285-
286265

287266
@pytest.mark.parametrize("input_val, expected", [
288267
# Numeric values

0 commit comments

Comments
 (0)