Skip to content

Commit c349db7

Browse files
committed
Time queries, styling
Avoid overflow errors updating tap_collections.json slight adjustments to parsing logic catalog tests typo correction addressing comments Some rebase fixes Rebase fix
1 parent 1d1419f commit c349db7

5 files changed

Lines changed: 1309 additions & 296 deletions

File tree

astroquery/mast/__init__.py

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Conf(_config.ConfigNamespace):
1515
"""
1616

1717
server = _config.ConfigItem(
18-
'https://masttest.stsci.edu',
18+
'https://mast.stsci.edu',
1919
'Name of the MAST server.')
2020
ssoserver = _config.ConfigItem(
2121
'https://ssoportal.stsci.edu',
@@ -37,18 +37,28 @@ class Conf(_config.ConfigNamespace):
3737

3838
conf = Conf()
3939

40-
from .cutouts import TesscutClass, Tesscut, ZcutClass, Zcut, HapcutClass, Hapcut
41-
from .observations import Observations, ObservationsClass, MastClass, Mast
40+
from . import utils
4241
from .collections import Catalogs, CatalogsClass
42+
from .cutouts import Hapcut, HapcutClass, Tesscut, TesscutClass, Zcut, ZcutClass
4343
from .missions import MastMissions, MastMissionsClass
44-
from . import utils
44+
from .observations import Mast, MastClass, Observations, ObservationsClass
4545

46-
__all__ = ['Observations', 'ObservationsClass',
47-
'Catalogs', 'CatalogsClass',
48-
'MastMissions', 'MastMissionsClass',
49-
'Mast', 'MastClass',
50-
'Tesscut', 'TesscutClass',
51-
'Zcut', 'ZcutClass',
52-
'Hapcut', 'HapcutClass',
53-
'Conf', 'conf', 'utils',
54-
]
46+
__all__ = [
47+
"Observations",
48+
"ObservationsClass",
49+
"Catalogs",
50+
"CatalogsClass",
51+
"MastMissions",
52+
"MastMissionsClass",
53+
"Mast",
54+
"MastClass",
55+
"Tesscut",
56+
"TesscutClass",
57+
"Zcut",
58+
"ZcutClass",
59+
"Hapcut",
60+
"HapcutClass",
61+
"Conf",
62+
"conf",
63+
"utils",
64+
]

0 commit comments

Comments
 (0)