sparclclient 1.2.3b8__tar.gz → 1.2.4b1__tar.gz

{sparclclient-1.2.3b8 → sparclclient-1.2.4b1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.3b8
+Version: 1.2.4b1
 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.3b8 → sparclclient-1.2.4b1}/sparcl/__init__.py

@@ -32,4 +32,5 @@ __all__ = ["client", "align_records"]
 # __version__ = "1.2.1"
 # FIRST uncommented value will be used! (so only leave one uncommented)
 #__version__ = "1.2.2"
-__version__ = "1.2.3b8"
+#__version__ = "1.2.3"
+__version__ = "1.2.4b1"

{sparclclient-1.2.3b8 → sparclclient-1.2.4b1}/tests/expected_pat.py

@@ -87,9 +87,11 @@ authorized_1 = {
     "Loggedin_As": "test_user_1@noirlab.edu",
     "Authorized_Datasets": {
         "BOSS-DR16",
+        "BOSS-DR17",
         "DESI-DR1",
         "DESI-EDR",
         "SDSS-DR16",
+        "SDSS-DR17",
         "SDSS-DR17-test",
     },
 }
@@ -107,20 +109,21 @@ authorized_3 = {
 # Private and Public
 pub_1 = ["BOSS-DR16"]
 pub_all = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
-priv = ["DESI-DR1", "SDSS-DR17-test"]
+priv = ["DESI-DR1", "SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
 all_all = pub_all + priv
 all_all.sort()
+privpub1 = [pub_all[0], priv[0]]
 unauth = "test_user_2@noirlab.edu"
 #
 auth_find_1 = auth_find_2 = all_all
 auth_find_3 = auth_retrieve_3 = (f"[DSDENIED] uname='{unauth}' is declined "
-                                 f"access to datasets={priv}; "
-                                 f"drs_requested={all_all} "
+                                 f"access to datasets={[priv[0]]}; "
+                                 f"drs_requested={privpub1} "
                                  f"my_auth={pub_all}")
 auth_find_4 = auth_find_6 = pub_all
 auth_find_5 = auth_retrieve_6 = ("[DSDENIED] uname='ANONYMOUS' is declined "
-                                 f"access to datasets={priv}; "
-                                 f"drs_requested={all_all} "
+                                 f"access to datasets={[priv[0]]}; "
+                                 f"drs_requested={privpub1} "
                                  f"my_auth={pub_all}")
-auth_retrieve_1 = auth_retrieve_2 = pub_1 + priv
+auth_retrieve_1 = auth_retrieve_2 = privpub1
 auth_retrieve_4 = auth_retrieve_5 = auth_retrieve_7 = auth_retrieve_8 = pub_1

{sparclclient-1.2.3b8 → sparclclient-1.2.4b1}/tests/tests_api.py

@@ -757,9 +757,10 @@ class AuthTest(unittest.TestCase):
 
         # Dataset lists
         cls.Pub = ["BOSS-DR16", "DESI-EDR", "SDSS-DR16"]
-        cls.Priv = ["DESI-DR1", "SDSS-DR17-test"]
+        cls.Priv = ["DESI-DR1", "SDSS-DR17-test", "BOSS-DR17", "SDSS-DR17"]
         cls.PrivPub = cls.Priv + cls.Pub
         cls.PrivPub.sort()
+        cls.PrivPub1 = [cls.Priv[0], cls.Pub[0]]
 
         # Sample list of sparcl_ids from each data set
         out = ["sparcl_id"]
@@ -773,7 +774,7 @@ class AuthTest(unittest.TestCase):
         cls.uuid_priv = (
             cls.client.find(
                 outfields=out,
-                constraints={"data_release": cls.Priv},
+                constraints={"data_release": [cls.Priv[0]]},
                 limit=2,
                 sort="sparcl_id",
             )
@@ -996,7 +997,7 @@ class AuthTest(unittest.TestCase):
     def test_auth_find_3(self):
         """Test find method with unauthorized user; private data set"""
         exp = "exp.auth_find_3"
-        self.auth_find(self.unauth_user, self.PrivPub, exp)
+        self.auth_find(self.unauth_user, self.PrivPub1, exp)
 
     # | find | Unauth | None | PASS |
     def test_auth_find_4(self):
@@ -1009,7 +1010,7 @@ class AuthTest(unittest.TestCase):
         """Test find method with anonymous user; private data set
         specified"""
         exp = "exp.auth_find_5"
-        self.auth_find(None, self.PrivPub, exp)
+        self.auth_find(None, self.PrivPub1, exp)
 
     # | find | Anon | None | PASS |
     def test_auth_find_6(self):
@@ -1022,7 +1023,7 @@ class AuthTest(unittest.TestCase):
     def test_auth_retrieve_1(self):
         """Retrieve method with authorized user; private data set specified"""
         exp = "exp.auth_retrieve_1"
-        self.auth_retrieve(self.auth_user, self.PrivPub, exp)
+        self.auth_retrieve(self.auth_user, self.PrivPub1, exp)
 
     # | retrieve | Auth | None | PASS |
     # @skip("Does not return Priv")  # @@@
@@ -1036,7 +1037,7 @@ class AuthTest(unittest.TestCase):
     def test_auth_retrieve_3(self):
         """Retrieve method with unauthorized user; private dataset specified"""
         exp = "exp.auth_retrieve_3"
-        self.auth_retrieve(self.unauth_user, self.PrivPub, exp)
+        self.auth_retrieve(self.unauth_user, self.PrivPub1, exp)
 
     # | retrieve | Unauth | None | PASS |
     # Should PASS since default (no data sets) means only
@@ -1059,7 +1060,7 @@ class AuthTest(unittest.TestCase):
         """Retrieve method with anonymous user; private data set specified"""
         self.silent_logout()
         exp = "exp.auth_retrieve_6"
-        self.auth_retrieve(None, self.PrivPub, exp)
+        self.auth_retrieve(None, self.PrivPub1, exp)
         #!# Replace exception name below once real one is created
 
     # | retrieve | Anon | None | PASS |