Skip to content

Commit a31ab86

Browse files
authored
Merge pull request #2257 from esdc-esac-esa-int/jwst_astroquery_doc_fix
(Minor fix)eJWST - remove login_gui method from documentation
2 parents 11c9c83 + 7131071 commit a31ab86

File tree

5 files changed

+7
-33
lines changed

5 files changed

+7
-33
lines changed

CHANGES.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ New Tools and Services
88
Service fixes and enhancements
99
------------------------------
1010

11+
esa.jwst
12+
^^^^^^^^^^
13+
14+
- Minor fixes, documentation updated. [#2257]
1115

1216
Infrastructure, Utility and Other Changes and Additions
1317
-------------------------------------------------------

astroquery/esa/jwst/core.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -647,17 +647,6 @@ def login(self, *, user=None, password=None, credentials_file=None,
647647
if token:
648648
self.set_token(token=token)
649649

650-
def login_gui(self, *, verbose=False):
651-
"""Performs a login using a GUI dialog
652-
TAP+ only
653-
654-
Parameters
655-
----------
656-
verbose : bool, optional, default 'False'
657-
flag to display information about the process
658-
"""
659-
return self.__jwsttap.login_gui(verbose)
660-
661650
def logout(self, *, verbose=False):
662651
"""Performs a logout
663652
TAP+ only

astroquery/esa/jwst/data_access.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
"""
1111

1212
from astropy.utils import data
13+
from . import conf
1314

1415
__all__ = ['JwstDataHandler']
1516

1617

1718
class JwstDataHandler:
1819
def __init__(self, base_url=None):
1920
if base_url is None:
20-
self.base_url = "http://jwstdummydata.com"
21+
self.base_url = conf.JWST_DATA_SERVER
2122
else:
2223
self.base_url = base_url
2324

astroquery/esa/jwst/tests/test_jwsttap.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,14 +1002,6 @@ def test_login(self):
10021002
tap.login(user='test_user', password='test_password')
10031003
dummyTapHandler.check_call('login', parameters)
10041004

1005-
def test_login_gui(self):
1006-
dummyTapHandler = DummyTapHandler()
1007-
tap = JwstClass(tap_plus_handler=dummyTapHandler, show_messages=False)
1008-
parameters = {}
1009-
parameters['verbose'] = False
1010-
tap.login_gui()
1011-
dummyTapHandler.check_call('login_gui', parameters)
1012-
10131005
def test_logout(self):
10141006
dummyTapHandler = DummyTapHandler()
10151007
tap = JwstClass(tap_plus_handler=dummyTapHandler, show_messages=False)

docs/esa/jwst.rst

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ To remove asynchronous
651651
-----------------------
652652

653653
Authenticated users are able to access to TAP+ capabilities (shared tables, persistent jobs, etc.)
654-
In order to authenticate a user, ``login``, ``login_gui`` or ``login_token_gui`` methods must be called. After a successful
654+
In order to authenticate a user, ``login`` method must be called. After a successful
655655
authentication, the user will be authenticated until ``logout`` method is called.
656656

657657
All previous methods (``query_object``, ``cone_search``, ``load_table``, ``load_tables``, ``launch_job``) explained for
@@ -667,18 +667,6 @@ The main differences are:
667667
2.1. Login/Logout
668668
~~~~~~~~~~~~~~~~~
669669

670-
Using the graphic interface:
671-
672-
673-
*Note: Tkinter module is required to use login_gui method.*
674-
675-
.. code-block:: python
676-
677-
>>> from astroquery.esa.jwst import Jwst
678-
>>> from astroquery.esa.jwst import Jwst
679-
>>> Jwst.login_gui()
680-
681-
682670
Using the command line:
683671

684672
.. code-block:: python

0 commit comments

Comments
 (0)