sparclclient 1.2.6b13__tar.gz → 1.2.7b1__tar.gz

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.6b13
+Version: 1.2.7b1
 Summary: A client for getting spectra and meta-data from NOIRLab.
 Author-email: "S. Pothier" <datalab-spectro@noirlab.edu>
 Description-Content-Type: text/markdown

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/pyproject.toml

@@ -31,6 +31,9 @@ dependencies = ["requests==2.31.0", "numpy>=1.23.5,<1.26.4", "spectres", "pyjwt"
 "Bug Tracker" = "https://github.com/pypa/sparclclient/issues"
 "Documentation" = "https://sparclclient.readthedocs.io/en/latest/"
 
+[tool.ruff.lint]
+select = ["NPY201"]
+
 [tool.flit.module]
 name = "sparcl"
 

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/requirements-client.txt

@@ -1,4 +1,5 @@
 requests==2.31.0 # 2.26.0
-numpy>=1.23.5,<1.26.4
+#numpy>=1.23.5,<1.26.4
+numpy>=2.3.0
 spectres
 pyjwt

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/source/conf.py

@@ -11,11 +11,11 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
+from sparcl import __version__
 import os
 import re
 import sys
 sys.path.insert(0, os.path.abspath(".."))
-from sparcl import __version__
 
 # -- Project information -----------------------------------------------------
 
@@ -26,7 +26,7 @@ author = "S.Pothier, A.Jacques"
 #!version = client_version
 sver = __version__
 mo = re.match(
-    "^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$",
+    "^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$",  # noqa: E501, W605
     sver,
 )
 release = sver

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/sparcl/__init__.py

@@ -35,4 +35,5 @@ __all__ = ["client", "align_records"]
 #__version__ = "1.2.3"
 #__version__ = "1.2.4"
 #__version__ = "1.2.5"
-__version__ = "1.2.6b13"
+#__version__ = "1.2.6"
+__version__ = "1.2.7b1"

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/sparcl/client.py

@@ -163,7 +163,7 @@ class SparclClient:  # was SparclApi()
             Defaults to True.
 
     Example:
-        >>> client = SparclClient()
+        >>> client = SparclClient(announcement=False)
 
     Raises:
         Exception: Object creation compares the version from the
@@ -199,7 +199,8 @@ class SparclClient:  # was SparclApi()
         #!self.internal_names = internal_names
         self.c_timeout = min(MAX_CONNECT_TIMEOUT,
                              float(connect_timeout))  # seconds
-        self.r_timeout = min(MAX_READ_TIMEOUT, float(read_timeout))  # seconds
+        self.r_timeout = min(MAX_READ_TIMEOUT,
+                             float(read_timeout))  # seconds
 
         # require response within this num seconds
         # https://2.python-requests.org/en/master/user/advanced/#timeouts
@@ -214,7 +215,7 @@ class SparclClient:  # was SparclApi()
         if announcement:
             ann = f"{self.apiurl}/announcement/"
             annres = requests.get(ann, timeout=self.timeout)
-            annstr = annres.json()['announcement']
+            annstr = annres.json()["announcement"]
             if annstr:
                 print(f"announcement={annstr}")
 
@@ -308,7 +309,7 @@ class SparclClient:  # was SparclApi()
 
         Example:
             >>>
-            >> client = SparclClient()
+            >> client = SparclClient(announcement=False)
             >> client.login('test_user@noirlab.edu', 'testpw')
             Logged in successfully with email='test_user@noirlab.edu'
         """
@@ -343,8 +344,8 @@ class SparclClient:  # was SparclApi()
             self.renew_token = None
             self.token_exp = None
             msg = (
-                'Could not login with given credentials. '
-                'Reverted to "Anonymous" user.'
+                'Could not login with given credentials. Reverted '
+                'to "Anonymous" user.'
             )
             return msg
 
@@ -372,7 +373,7 @@ class SparclClient:  # was SparclApi()
             None.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> client.logout()
             Logged-out successfully.  Previously logged-in with email None.
         """
@@ -412,16 +413,16 @@ class SparclClient:  # was SparclApi()
         parameter of client.retrieve().
 
         Args:
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of
-                data sets from which to get the default fields. Defaults
-                to None, which will return the intersection of default
-                fields in all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to get the default fields. Defaults to None, which
+                will return the intersection of default fields in all
+                data sets hosted on the SPARCL database.
 
         Returns:
             List of fields tagged as 'default' from DATASET_LIST.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> client.get_default_fields()
             ['dec', 'flux', 'ra', 'sparcl_id', 'specid', 'wavelength']
         """
@@ -443,16 +444,16 @@ class SparclClient:  # was SparclApi()
         of client.retrieve().
 
         Args:
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to get all fields. Defaults to None, which
-                will return the intersection of all fields in all data sets
-                hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to get all fields. Defaults to None, which
+                will return the intersection of all fields in all
+                data sets hosted on the SPARCL database.
 
         Returns:
             List of fields tagged as 'all' from DATASET_LIST.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> client.get_all_fields()
             ['data_release', 'datasetgroup', 'dateobs', 'dateobs_center', 'dec', 'exptime', 'flux', 'instrument', 'ivar', 'mask', 'model', 'ra', 'redshift', 'redshift_err', 'redshift_warning', 'site', 'sparcl_id', 'specid', 'specprimary', 'spectype', 'survey', 'targetid', 'telescope', 'wave_sigma', 'wavelength', 'wavemax', 'wavemin']
         """  # noqa: E501
@@ -500,16 +501,16 @@ class SparclClient:  # was SparclApi()
         client.retreive().
 
         Args:
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to get available fields. Defaults to None,
-                which will return the intersection of all available fields
-                in all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to get available fields. Defaults to None, which
+                will return the intersection of all available fields in
+                all data sets hosted on the SPARCL database.
 
         Returns:
             Set of fields available from data sets in DATASET_LIST.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> sorted(client.get_available_fields())
             ['data_release', 'datasetgroup', 'dateobs', 'dateobs_center', 'dec', 'exptime', 'extra_files', 'file', 'flux', 'instrument', 'ivar', 'mask', 'model', 'ra', 'redshift', 'redshift_err', 'redshift_warning', 'site', 'sparcl_id', 'specid', 'specprimary', 'spectype', 'survey', 'targetid', 'telescope', 'updated', 'wave_sigma', 'wavelength', 'wavemax', 'wavemin']
 
@@ -529,7 +530,7 @@ class SparclClient:  # was SparclApi()
             API version (:obj:`float`).
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> client.version
             12.0
         """
@@ -556,10 +557,10 @@ class SparclClient:  # was SparclApi()
         """Find records in the SPARCL database.
 
         Args:
-            outfields (:obj:`list` of :obj:`str`, optional): List of
-                fields to return. Only CORE fields may be passed to
-                this parameter. Defaults to None, which will return
-                only the sparcl_id and _dr fields.
+            outfields (:obj:`list`, optional): List of fields to return.
+                Only CORE fields may be passed to this parameter.
+                Defaults to None, which will return only the sparcl_id
+                and _dr fields.
 
             constraints (:obj:`dict`, optional): Key-Value pairs of
                 constraints to place on the record selection. The Key
@@ -582,7 +583,7 @@ class SparclClient:  # was SparclApi()
             :class:`~sparcl.Results.Found`: Contains header and records.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> outs = ['sparcl_id', 'ra', 'dec']
             >>> cons = {'spectype': ['GALAXY'], 'redshift': [0.5, 0.9]}
             >>> found = client.find(outfields=outs, constraints=cons)
@@ -642,17 +643,22 @@ class SparclClient:  # was SparclApi()
         return found
 
     def missing(
-        self, uuid_list, *, dataset_list=None, countOnly=False, verbose=False
+        self,
+        uuid_list,
+        *,
+        dataset_list=None,
+        countOnly=False,
+        verbose=False
     ):
         """Return the subset of sparcl_ids in the given uuid_list that are
         NOT stored in the SPARCL database.
 
         Args:
-            uuid_list (:obj:`list` of :obj:`str`): List of sparcl_ids.
+            uuid_list (:obj:`list`): List of sparcl_ids.
 
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to find missing sparcl_ids. Defaults to None,
-                meaning all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to find missing sparcl_ids. Defaults to None, meaning
+                all data sets hosted on the SPARCL database.
 
             countOnly (:obj:`bool`, optional): Set to True to return only
                 a count of the missing sparcl_ids from the uuid_list.
@@ -666,9 +672,9 @@ class SparclClient:  # was SparclApi()
             are NOT stored in the SPARCL database.
 
         Example:
-            >>> client = SparclClient()
-            >>> sparcl_ids = ['ddbb57ee-8e90-4a0d-823b-0f5d97028076',]
-            >>> client.missing(uuid_list=sparcl_ids)
+            >>> client = SparclClient(announcement=False)
+            >>> ids = ['ddbb57ee-8e90-4a0d-823b-0f5d97028076',]
+            >>> client.missing(ids)
             ['ddbb57ee-8e90-4a0d-823b-0f5d97028076']
         """
 
@@ -703,11 +709,11 @@ class SparclClient:  # was SparclApi()
         NOT stored in the SPARCL database.
 
         Args:
-            specid_list (:obj:`list` of :obj:`int`): List of specids.
+            specid_list (:obj:`list`): List of specids.
 
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to find missing specids. Defaults to None,
-                meaning all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to find missing specids. Defaults to None, meaning
+                all data sets hosted on the SPARCL database.
 
             countOnly (:obj:`bool`, optional): Set to True to return only
                 a count of the missing specids from the specid_list.
@@ -721,10 +727,11 @@ class SparclClient:  # was SparclApi()
             are NOT stored in the SPARCL database.
 
         Example:
-            >>> client = SparclClient()
-            >>> specids = [398913623742323421, 6181239242670493696]
-            >>> client.missing_specids(specid_list=specids)
-            [398913623742323421]
+            >>> client = SparclClient(announcement=False)
+            >>> found = client.find(outfields=['specid'], limit=2)
+            >>> specids = [f.specid for f in found.records]
+            >>> client.missing_specids(specids + ['6802933904984788992'])
+            ['6802933904984788992']
         """
         if dataset_list is None:
             dataset_list = self.fields.all_drs
@@ -790,15 +797,15 @@ class SparclClient:  # was SparclApi()
         sparcl_ids.
 
         Args:
-            uuid_list (:obj:`list` of :obj:`str`): List of sparcl_ids.
+            uuid_list (:obj:`list`): List of sparcl_ids.
 
-            include (:obj:`list` of :obj:`str`, optional): List of field
-                names to include in each record. Defaults to 'DEFAULT',
-                which will return the fields tagged as 'default'.
+            include (:obj:`list`, optional): List of field names to include
+                in each record. Defaults to 'DEFAULT', which will return
+                the fields tagged as 'default'.
 
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to retrieve spectra data. Defaults to None,
-                meaning all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to retrieve spectra data. Defaults to None, meaning all
+                data sets hosted on the SPARCL database.
 
             limit (:obj:`int`, optional): Maximum number of records to
                 return. Defaults to 500. Maximum allowed is 24,000.
@@ -810,7 +817,7 @@ class SparclClient:  # was SparclApi()
             :class:`~sparcl.Results.Retrieved`: Contains header and records.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> ids = client.find(limit=1).ids
             >>> inc = ['sparcl_id', 'flux', 'wavelength', 'model']
             >>> ret = client.retrieve(uuid_list=ids, include=inc)
@@ -993,15 +1000,15 @@ class SparclClient:  # was SparclApi()
         specids.
 
         Args:
-            specid_list (:obj:`list` of :obj:`int`): List of specids.
+            specid_list (:obj:`list`): List of specids.
 
-            include (:obj:`list` of :obj:`str`, optional): List of field
-                names to include in each record. Defaults to 'DEFAULT',
-                which will return the fields tagged as 'default'.
+            include (:obj:`list`, optional): List of field names to include
+                in each record. Defaults to 'DEFAULT', which will return
+                the fields tagged as 'default'.
 
-            dataset_list (:obj:`list` of :obj:`str`, optional): List of data
-                sets from which to retrieve spectra data. Defaults to None,
-                meaning all data sets hosted on the SPARCL database.
+            dataset_list (:obj:`list`, optional): List of data sets from
+                which to retrieve spectra data. Defaults to None, meaning all
+                data sets hosted on the SPARCL database.
 
             limit (:obj:`int`, optional): Maximum number of records to
                 return. Defaults to 500. Maximum allowed is 24,000.
@@ -1013,7 +1020,7 @@ class SparclClient:  # was SparclApi()
             :class:`~sparcl.Results.Retrieved`: Contains header and records.
 
         Example:
-            >>> client = SparclClient()
+            >>> client = SparclClient(announcement=False)
             >>> sids = [5840097619402313728, -8985592895187431424]
             >>> inc = ['specid', 'flux', 'wavelength', 'model']
             >>> ret = client.retrieve_by_specid(specid_list=sids, include=inc)
@@ -1052,9 +1059,9 @@ class SparclClient:  # was SparclApi()
             usrcount = len(specid_list)
             dbcount = found.count
             warn = (
-                f"UserWarning: Some specIDs were not found. "
+                f"UserWarning: Some SPECIDs were not found. "
                 f"{usrcount - dbcount} out of the {usrcount} requested "
-                f"specids have no records available in the SPARCL database "
+                f"uuids have no records available in the SPARCL database "
                 f"associated with DataSets {dr_list}."
             )
             print(warn)

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/sparcl/gather_2d.py

@@ -39,9 +39,7 @@ def _wavelength_offsets(records):
         set(records[0].wavelength).union(*[r.wavelength for r in records[1:]])
     )
     # offsets[ri] = index into WINDOW
-    offsets = {
-        ri: window.index(rec.wavelength[0]) for ri, rec in enumerate(records)
-    }
+    offsets = {ri: window.index(rec.wavelength[0]) for ri, rec in enumerate(records)}  # noqa: E501
     return (window, offsets)
 
 
@@ -89,7 +87,7 @@ def _align_wavelengths(records):
 
 
 def _tt1(numrecs=20, dr="BOSS-DR16"):
-    client = sparcl.client.SparclClient()
+    client = sparcl.client.SparclClient(announcement=False)
     found = client.find(constraints=dict(data_release=[dr]), limit=numrecs)
     got = client.retrieve(found.ids)
     records = got.records
@@ -188,7 +186,7 @@ def align_records(records, fields=["flux", "wavelength"], precision=7):
         - grid(ndarray): 1D numpy array containing wavelength values.
 
     Example:
-        >>> client = sparcl.client.SparclClient()
+        >>> client = sparcl.client.SparclClient(announcement=False)
         >>> specflds = ['wavelength', 'model']
         >>> cons = {"data_release": ['BOSS-DR16']}
         >>> found = client.find(constraints=cons, limit=21)

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/sparcl/resample_spectra.py

@@ -32,10 +32,9 @@ def _resample_flux(records, wavstep=1):
 
 
 def _tt0(numrecs=20):
-    client = sparcl.client.SparclClient()
-    found = client.find(
-        constraints=dict(data_release=["BOSS-DR16"]), limit=numrecs
-    )
+    client = sparcl.client.SparclClient(announcement=False)
+    found = client.find(constraints=dict(data_release=["BOSS-DR16"]),
+                        limit=numrecs)
     got = client.retrieve(found.ids)
     flux_2d, new_wavs = _resample_flux(got.records)
     return flux_2d, new_wavs

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/tests/expected_pat.py

@@ -40,19 +40,10 @@ retrieve_0b = ["_dr", "dec", "flux", "ra", "sparcl_id", "specid", "wavelength"]
 
 retrieve_5 = 2
 
-# OLD as of August 23, 2024
-#find_0 = [
-#    {
-#        "_dr": "BOSS-DR16",
-#        "data_release": "BOSS-DR16",
-#        "specid": -6444532452352045056,
-#    }
-#]
-
 find_0 = [
     {
-        '_dr': 'BOSS-DR16',
-        'data_release': 'BOSS-DR16',
+        '_dr': 'BOSS-DR17',
+        'data_release': 'BOSS-DR17',
         'telescope': 'sloan25m'
     }
 ]
@@ -67,13 +58,6 @@ find_1 = [
 
 find_2 = 936894  # PAT
 
-# OLD as of August 23, 2024
-#find_3 = [
-#    {"_dr": "BOSS-DR16", "data_release": "BOSS-DR16"},
-#    {"_dr": "DESI-EDR", "data_release": "DESI-EDR"},
-#    {"_dr": "SDSS-DR16", "data_release": "SDSS-DR16"},
-#]
-
 find_4 = 36
 
 find_5a = [
@@ -98,33 +82,28 @@ authorized_1 = {
 
 authorized_2 = {
     "Loggedin_As": "test_user_2@noirlab.edu",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"},
+    "Authorized_Datasets": {"DESI-DR1", "SDSS-DR17", "DESI-EDR", "BOSS-DR17"},
 }
 
 authorized_3 = {
     "Loggedin_As": "Anonymous",
-    "Authorized_Datasets": {"BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"},
+    "Authorized_Datasets": {"DESI-DR1", "SDSS-DR17", "DESI-EDR", "BOSS-DR17"},
 }
 
 # Private and Public
-pub_1 = ["BOSS-DR16"]
-pub_all = ["BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"]
-priv = ["SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
+pub_1 = ["BOSS-DR17"]
+pub_all = ["BOSS-DR17", "DESI-DR1", "DESI-EDR", "SDSS-DR17"]
+priv = ["SDSS-DR17-test", "BOSS-DR16", "SDSS-DR16"]
 all_all = pub_all + priv
 all_all.sort()
 privpub1 = [pub_all[0], priv[0]]
 unauth = "test_user_2@noirlab.edu"
 msg = "Find Results: 1000 records"
-# OLD as of July 9, 2025
-#auth_find_1 = privpub1
-#auth_find_2 = ['DESI-DR1', 'DESI-EDR']
 auth_find_1 = auth_find_2 = auth_find_4 = auth_find_6 = msg
 auth_find_3 = auth_retrieve_3 = (f"[DSDENIED] uname='{unauth}' is declined "
                                  f"access to datasets={[priv[0]]}; "
                                  f"drs_requested={privpub1} "
                                  f"my_auth={pub_all}")
-# OLD as of July 9, 2025
-#auth_find_4 = auth_find_6 = pub_all
 auth_find_5 = auth_retrieve_6 = ("[DSDENIED] uname='ANONYMOUS' is declined "
                                  f"access to datasets={[priv[0]]}; "
                                  f"drs_requested={privpub1} "

{sparclclient-1.2.6b13 → sparclclient-1.2.7b1}/tests/tests_api.py

@@ -72,7 +72,7 @@ import sparcl.gather_2d
 
 DEFAULT = "DEFAULT"
 ALL = "ALL"
-drs = ["BOSS-DR16"]
+drs = ["BOSS-DR17"]
 
 _DEV1 = "http://localhost:8050"  # noqa: E221
 _PAT1 = "https://sparc1.datalab.noirlab.edu"  # noqa: E221
@@ -90,6 +90,9 @@ showall = False
 showall = showall or os.environ.get("showall") == "1"
 if showall:
     showact = showcurl = clverb = True
+# If running on dev environment:
+devrun = False
+devrun = devrun or os.environ.get("devrun") == "1"
 
 usrpw = os.environ.get("usrpw")  # password for test users
 show_run_context = True  # Print message about parameters of this test run
@@ -188,9 +191,8 @@ class SparclClientTest(unittest.TestCase):
             show_run_context = False
 
         # Get some id_lists to use in tests
-        found = cls.client.find(
-            ["sparcl_id", "specid"], sort="sparcl_id", limit=5
-        )
+        found = cls.client.find(["sparcl_id", "specid"],
+                                sort="sparcl_id", limit=5)
         sparc_tups, spec_tups = list(
             zip(*[(r["sparcl_id"], r["specid"]) for r in found.records])
         )
@@ -212,9 +214,7 @@ class SparclClientTest(unittest.TestCase):
         cls.uuid_list0 = sparc_ids[:3]
         cls.uuid_list2 = sparc_ids[:3]
         # two real UUIDs, one fake
-        cls.uuid_list3 = sparc_ids[:2] + [
-            "00001ebf-d030-4d59-97e5-060c47202897"
-        ]
+        cls.uuid_list3 = sparc_ids[:2] + ["00001ebf-d030-4d59-97e5-060c47202897"]  # noqa: E501
         # two (probably) fake UUIDs
         cls.uuid_list4 = [
             "00001ebf-d030-4d59-97e5-060c47202897",
@@ -271,9 +271,8 @@ class SparclClientTest(unittest.TestCase):
         """Known missing"""
         uuids = [99, 88, 777]
         missing = self.client.missing(self.uuid_list0 + uuids)
-        self.assertEqual(
-            sorted(missing), sorted(uuids), msg="Actual to Expected"
-        )
+        self.assertEqual(sorted(missing), sorted(uuids),
+                         msg="Actual to Expected")
 
     def test_missing_1(self):
         """None missing"""
@@ -298,8 +297,7 @@ class SparclClientTest(unittest.TestCase):
     def test_retrieve_0(self):
         """Get spectra using small list of SPECIDS."""
         res = self.client.retrieve_by_specid(
-            self.specid_list0,
-            include=["sparcl_id", "specid", "flux"]
+            self.specid_list0, include=["sparcl_id", "specid", "flux"]
         )
         actual = sorted(res.records[0].keys())
         if showact:
@@ -348,7 +346,7 @@ class SparclClientTest(unittest.TestCase):
     def test_retrieve_3(self):
         """Issue warning when some sids do not exist."""
         uuids = self.uuid_list0
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
+        drs = ["SDSS-DR17", "BOSS-DR17", "DESI-EDR"]
         with self.assertWarns(Warning):
             self.client.retrieve(uuids + [999], dataset_list=drs)
 
@@ -371,7 +369,7 @@ class SparclClientTest(unittest.TestCase):
         outfields = ["data_release", "telescope"]
         # To get suitable constraints (in sparc-shell on Server):
         #    list(FitsRecord.objects.all().values('ra','dec'))
-        constraints = {"data_release": ['BOSS-DR16']}
+        constraints = {"data_release": ["BOSS-DR17"]}
         found = self.client.find(outfields, constraints=constraints, limit=3)
         actual = found.records[:1]
         if showact:
@@ -385,7 +383,7 @@ class SparclClientTest(unittest.TestCase):
         constraints = {
             "redshift": [0.191, 0.192],
             "exptime": [2100.2, 2100.31],
-            "data_release": ["SDSS-DR16"],
+            "data_release": ["SDSS-DR17"],
         }
         found = self.client.find(
             outfields, constraints=constraints, limit=1, sort="specid"
@@ -403,9 +401,7 @@ class SparclClientTest(unittest.TestCase):
     def test_find_2(self):
         """Limit=None."""
         outfields = ["sparcl_id", "ra", "dec"]
-        found = self.client.find(
-            outfields, limit=None, sort="sparcl_id"
-        )  # @@@
+        found = self.client.find(outfields, limit=None, sort="sparcl_id")
         actual = len(found.records)
         if showact:
             print(f"find_2: actual={pf(actual)}")
@@ -439,9 +435,8 @@ class SparclClientTest(unittest.TestCase):
     @skip("Not implemented. Waiting for switch to ingest-time field naming ")
     def test_find_5a(self):
         """Aux field values when they exists in all found records"""
-        found = self.client.find(
-            ["data_release", "mjd"], limit=5, sort="sparcl_id"
-        )
+        found = self.client.find(["data_release", "mjd"], limit=5,
+                                 sort="sparcl_id")
         actual = found.records
         if showact:
             print(f"find_5a: actual={pf(actual)}")
@@ -451,7 +446,7 @@ class SparclClientTest(unittest.TestCase):
     @skip("Not implemented. Waiting for switch to ingest-time field naming ")
     def test_find_5b(self):
         """Aux field in one Data Set but not another. (proper subset)"""
-        cons = {"data_release": ["SDSS-DR16", "DESI-EDR"]}
+        cons = {"data_release": ["SDSS-DR17", "DESI-EDR"]}
         f0 = self.client.find(
             ["data_release"], constraints=cons, limit=5, sort="sparcl_id"
         )
@@ -467,7 +462,7 @@ class SparclClientTest(unittest.TestCase):
     @skip("Not implemented. Waiting for switch to ingest-time field naming ")
     def test_find_5c(self):
         """Aux field values when they do not exist in any found records"""
-        cons = {"data_release": ["SDSS-DR16", "DESI-EDR"]}
+        cons = {"data_release": ["SDSS-DR17", "DESI-EDR"]}
         nsf = "NO_SUCH_FIELD"
         f1 = self.client.find(
             ["data_release", nsf], constraints=cons, limit=5, sort="sparcl_id"
@@ -534,9 +529,8 @@ class SparclClientTest(unittest.TestCase):
         actual = [f["specid"] for f in res_reorder.records]
         if showact:
             print(f"reorder_2b: actual={pf(actual)}")
-        self.assertEqual(
-            actual, specids[:2] + [None], msg="Actual to Expected"
-        )
+        self.assertEqual(actual, specids[:2] + [None],
+                         msg="Actual to Expected")
 
     def test_reorder_3a(self):
         """Test for expected Exception when a list of sparcl_ids with
@@ -571,7 +565,7 @@ class SparclClientTest(unittest.TestCase):
         ids = self.uuid_list4
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
+        drs = ["SDSS-DR17", "BOSS-DR17", "DESI-EDR"]
         with self.assertWarns(Warning):
             res = self.client.retrieve(ids, dataset_list=drs)
         self.timing[name] = toc()
@@ -585,7 +579,7 @@ class SparclClientTest(unittest.TestCase):
         specids = self.specid_list4
 
         tic()
-        drs = ["SDSS-DR16", "BOSS-DR16", "DESI-EDR"]
+        drs = ["SDSS-DR17", "BOSS-DR17", "DESI-EDR"]
         res = self.client.retrieve_by_specid(specids, dataset_list=drs)
         self.timing[name] = toc()
         with self.assertRaises(ex.NoRecords):
@@ -593,12 +587,12 @@ class SparclClientTest(unittest.TestCase):
 
     def test_dls_468(self):
         idss = self.client.find(
-            constraints={"data_release": ["SDSS-DR16"]}, limit=1
+            constraints={"data_release": ["SDSS-DR17"]}, limit=1
         ).ids
         re = self.client.retrieve(
             uuid_list=idss,
             include=["ra", "dec"],
-            dataset_list=["SDSS-DR16"],
+            dataset_list=["SDSS-DR17"],
             verbose=False,
         )
         self.assertEqual(1, re.count)
@@ -618,11 +612,11 @@ class AlignRecordsTest(unittest.TestCase):
             )
 
         cls.client = sparcl.client.SparclClient(
-            url=serverurl, verbose=clverb, show_curl=showcurl
-        )
-        found = cls.client.find(
-            constraints={"data_release": ["BOSS-DR16"]}, limit=20
+            url=serverurl, verbose=clverb, show_curl=showcurl,
+            announcement=False
         )
+        found = cls.client.find(constraints={"data_release": ["BOSS-DR17"]},
+                                limit=20)
         cls.found = found
         cls.specflds = ["wavelength", "flux", "ivar", "mask", "model"]
         cls.got = cls.client.retrieve(found.ids, include=cls.specflds)
@@ -654,18 +648,16 @@ class AlignRecordsTest(unittest.TestCase):
         wavelength grid."""
 
         #! print(f'Fields={list(self.got.records[0].keys())}')
-        ar_dict, grid = sg.align_records(
-            self.got.records, fields=self.specflds
-        )
+        ar_dict, grid = sg.align_records(self.got.records,
+                                         fields=self.specflds)
         self.assertEqual(sorted(ar_dict.keys()), sorted(self.specflds))
 
     # Requirement #3 from DLS-280
     def test_align_3(self):
         """Verify shapes of arrays"""
 
-        ar_dict, grid = sg.align_records(
-            self.got.records, fields=self.specflds
-        )
+        ar_dict, grid = sg.align_records(self.got.records,
+                                         fields=self.specflds)
         shape = list(ar_dict.values())[0].shape
         self.assertEqual(shape, (20, 4621))
 
@@ -681,9 +673,8 @@ class AlignRecordsTest(unittest.TestCase):
         """Verify wavelength given."""
         msg = 'You must provide "wavelength" spectra field'
         with self.assertRaises(Exception, msg=msg):
-            ar_dict, grid = sg.align_records(
-                self.got.records, fields=["flux", "model"]
-            )
+            ar_dict, grid = sg.align_records(self.got.records,
+                                             fields=["flux", "model"])
 
     # Requirement #6  from DLS-280
     def test_align_6(self):
@@ -723,13 +714,12 @@ class AuthTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         if clverb:
-            print(
-                f"\n# Running AuthTest:setUpClass() "
-                f"{str(datetime.datetime.now())}"
-            )
+            print(f"\n# Running AuthTest:setUpClass() "
+                  f"{str(datetime.datetime.now())}")
 
         cls.client = sparcl.client.SparclClient(
             url=serverurl, verbose=clverb, show_curl=showcurl,
+            announcement=False
         )
 
         global show_run_context
@@ -746,8 +736,8 @@ class AuthTest(unittest.TestCase):
         cls.unauth_user = "test_user_2@noirlab.edu"
 
         # Dataset lists
-        cls.Pub = ["BOSS-DR16", "DESI-DR1", "DESI-EDR", "SDSS-DR16"]
-        cls.Priv = ["SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
+        cls.Pub = ["BOSS-DR17", "DESI-DR1", "DESI-EDR", "SDSS-DR17"]
+        cls.Priv = ["SDSS-DR17-test", "BOSS-DR16", "SDSS-DR16"]
         cls.PrivPub = cls.Priv + cls.Pub
         cls.PrivPub.sort()
         cls.PrivPub1 = [cls.Priv[0], cls.Pub[0]]
@@ -780,7 +770,7 @@ class AuthTest(unittest.TestCase):
         cls.uuid_pub = (
             cls.client.find(
                 outfields=out,
-                constraints={"data_release": ["BOSS-DR16"]},
+                constraints={"data_release": ["BOSS-DR17"]},
                 limit=2,
                 sort="sparcl_id",
             )
@@ -838,7 +828,7 @@ class AuthTest(unittest.TestCase):
         expected = 279
         res = requests.post(f"{self.client.apiurl}/get_token/", json=json)
         self.assertEqual(res.status_code, 200, res.content.decode())
-        token = res.json()['access']
+        token = res.json()["access"]
         actual = len(token)
         if showact:
             print(f"test_get_token: ({len(token)}) {token=!s}")
@@ -848,8 +838,8 @@ class AuthTest(unittest.TestCase):
         json = {"email": self.auth_user, "password": usrpw}
         res = requests.post(f"{self.client.apiurl}/get_token/", json=json)
         token = res.json()
-        self.client.token = token['access']
-        self.client.renew_token = token['refresh']
+        self.client.token = token["access"]
+        self.client.renew_token = token["refresh"]
 
     def test_token_not_expired(self):
         self.getToken()
@@ -867,11 +857,11 @@ class AuthTest(unittest.TestCase):
 
     def test_token_expired_renew(self):
         """
-            POST http://localhost:8050/sparc/renew_token/
-            Content-Type: application/json
-            {
-              "token": "..."
-            }
+        POST http://localhost:8050/sparc/renew_token/
+        Content-Type: application/json
+        {
+          "token": "..."
+        }
 
         """
         self.getToken()
@@ -919,11 +909,8 @@ class AuthTest(unittest.TestCase):
         out = self.outflds
         try:
             if drs is None:
-                found = self.client.find(
-                    outfields=out,
-                    constraints=cons,
-                    limit=limit
-                )
+                found = self.client.find(outfields=out, constraints=cons,
+                                         limit=limit)
             else:
                 found = self.client.find(
                     outfields=out,
@@ -933,17 +920,15 @@ class AuthTest(unittest.TestCase):
             #!if showact:
             #!    print(f"{expvar}: {found.records=}")
 
-            #actual = sorted(set([r._dr for r in found.records]))
+            # actual = sorted(set([r._dr for r in found.records]))
             actual = str(found)
         except Exception as err:
             actual = str(err)
         finally:
             self.silent_logout()
         if showact:
-            print(
-                f"{expvar}: {actual=}"
-                f" {self.client.authorized=} {user=} {drs=}"
-            )
+            print(f"{expvar}: {actual=} {self.client.authorized=} "
+                  f"{user=} {drs=}")
         self.assertEqual(actual, expected, msg="Actual to Expected")
 
     def auth_retrieve(self, user, drs, expvar):
@@ -956,24 +941,22 @@ class AuthTest(unittest.TestCase):
             if drs is None:
                 got = self.client.retrieve(uuid_list=ids, include=inc)
             else:
-                got = self.client.retrieve(
-                    uuid_list=ids, include=inc, dataset_list=drs
-                )
+                got = self.client.retrieve(uuid_list=ids, include=inc,
+                                           dataset_list=drs)
             actual = sorted(set([r._dr for r in got.records]))
         except Exception as err:
             actual = str(err)
         finally:
             self.silent_logout()
         if showact:
-            print(
-                f"{expvar}: {actual=}"
-                f" {self.client.authorized=} {user=} {drs=}"
-            )
+            print(f"{expvar}: {actual=} {self.client.authorized=} "
+                  f"{user=} {drs=}")
         self.assertEqual(actual, expected, msg="Actual to Expected")
 
     # | METHOD | USER | DATASETS | OK? |
     # | find | Auth | Priv,Pub | PASS |
     # @skip("Does not return Priv")  # @@@
+    @skipIf("devrun" in os.environ, "Running tests in dev environment")
     def test_auth_find_1(self):
         """Test find method with authorized user; private data set specified.
         Should find Authorized Private DR"""
@@ -982,11 +965,12 @@ class AuthTest(unittest.TestCase):
 
     # | find | Auth | None | PASS |
     # @skip("Does not return Priv")  # @@@
+    @skipIf("devrun" in os.environ, "Running tests in dev environment")
     def test_auth_find_2(self):
         """Test find method with authorized user; no data sets specified.
         Should find Authorized Private DR"""
         exp = "exp.auth_find_2"
-        constr = {'datasetgroup': ['DESI']}
+        constr = {"datasetgroup": ["DESI"]}
         self.auth_find(self.auth_user, None, exp, cons=constr)
 
     # | find | Unauth | Priv,Pub | FAIL |
@@ -996,6 +980,7 @@ class AuthTest(unittest.TestCase):
         self.auth_find(self.unauth_user, self.PrivPub1, exp)
 
     # | find | Unauth | None | PASS |
+    @skipIf("devrun" in os.environ, "Running tests in dev environment")
     def test_auth_find_4(self):
         """Test find method with unauthorized user; no data sets specified"""
         exp = "exp.auth_find_4"
@@ -1009,6 +994,7 @@ class AuthTest(unittest.TestCase):
         self.auth_find(None, self.PrivPub1, exp)
 
     # | find | Anon | None | PASS |
+    @skipIf("devrun" in os.environ, "Running tests in dev environment")
     def test_auth_find_6(self):
         """Test find method with anonymous user; no data sets specified"""
         exp = "exp.auth_find_6"