sparclclient 1.2.6b1__tar.gz → 1.2.6b3__tar.gz

{sparclclient-1.2.6b1 → sparclclient-1.2.6b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.6b1
+Version: 1.2.6b3
 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.6b1 → sparclclient-1.2.6b3}/sparcl/__init__.py

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

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

@@ -207,11 +207,17 @@ class SparclClient:  # was SparclApi()
         # (connect timeout, read timeout) in seconds
         self.timeout = (self.c_timeout, self.r_timeout)
         # @@@ read timeout should be a function of the POST payload size
-        self.announcement = f"{self.rooturl}/sparc/announcement/"
+        self.announcement = None
 
         if verbose:
             print(f"apiurl={self.apiurl}")
 
+        if announcement:
+            ann = f"{self.apiurl}/announcement/"
+            annstr = requests.get(ann, timeout=self.timeout).content
+            self.announcement = str(annstr)
+            print(f"announcement={self.announcement}")
+
         # Get API Version
         try:
             endpoint = f"{self.apiurl}/version/"
@@ -254,7 +260,8 @@ class SparclClient:  # was SparclApi()
             f" client_hash={ut.githash()},"
             f" verbose={self.verbose},"
             f" connect_timeout={self.c_timeout},"
-            f" read_timeout={self.r_timeout})"
+            f" read_timeout={self.r_timeout}),"
+            f" announcement={self.announcement})"
         )
 
     def token_expired(self, renew=False):