p2api 1.0.10__tar.gz → 1.0.11__tar.gz

{p2api-1.0.10 → p2api-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: p2api
-Version: 1.0.10
+Version: 1.0.11
 Summary: Binding for the ESO phase 2 programmatic API
 Project-URL: Homepage, https://www.eso.org/copdemo/apidoc/index.html
 Author-email: Thomas Bierwirth <thomas.bierwirth@eso.org>, John Pritchard <john.pritchard@eso.org>

p2api-1.0.11/p2api/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.0.11"

{p2api-1.0.10 → p2api-1.0.11}/p2api/p2api.py

@@ -170,7 +170,7 @@ class ApiConnection(object):
                 raise P2Error(500, 'POST', kwargs['url'], 'Invalid URL')
             self.apiUrl = API_URL[environment]
             self.loginUrl = LOGIN_URL[environment]
-            self.p2fc_url = P2FC_URL[param_values['environment']]
+            self.p2fc_url = P2FC_URL[environment]
             self.access_token = kwargs['access_token']
             self.session = self.requests_retry_session()
         else :

{p2api-1.0.10 → p2api-1.0.11}/p2api/utils/generate_finding_charts.py

@@ -211,10 +211,13 @@ def oneOB( api, obId ) :
         c_GAIA_im_noise=options.c_GAIA_im_noise,
     )
     oneOB_edt=datetime.datetime.now()
-    logging.info("Finding chart for OBid = %d, OBname = '%s' @ %s done in %s." % (obId, OB['name'], OB['instrument'], str(oneOB_edt-oneOB_sdt)))
+    logging.info(
+        "Finding chart for OBid = %d, OBname = '%s' @ %s done in %s."
+        % (obId, OB['name'], OB['instrument'], str(oneOB_edt-oneOB_sdt))
+    )
     if data is not None :
         try :
-            jwarn=json.loads(r.content.decode('utf-8'))
+            jwarn=json.loads(data.content.decode('utf-8'))
             if 'warnings' in jwarn.keys() :
                 logging.warning(jwarn['warnings'])
         except :

{p2api-1.0.10 → p2api-1.0.11}/p2api/utils/p2api_utils.py

@@ -8,7 +8,7 @@ import getpass
 import keyring
 import re
 
-from p2api.utils.eso_period import *
+#from p2api.utils.eso_period import *
 
 try:
     import astropy.units as u
@@ -78,7 +78,6 @@ def ESO_period_start_end_datetimes(P):
     y2=1967+(P+2)//2
     md2=ESO_period_first_last_dates[P%2][1]
     return ["{}{}".format(y1,md1),"{y2}{md2}.format(y2,md2)"]
-'''
 # ---------------------------------------------------------------------------------------
 def ESO_period_start_end_dates(P):
     return [
@@ -92,6 +91,7 @@ def ESO_period_start_end_datetimes(P):
         ESO_period_datetime_end(P),
     ]
 # ---------------------------------------------------------------------------------------
+'''
 def get_attrs(klass):
   return [k for k in klass.__dict__.keys()
     if not k.startswith('__')
@@ -106,7 +106,8 @@ source: https://groups.google.com/forum/?fromgroups=#!topic/comp.lang.python/bfb
 usage: parser = OptionParser(description=help_text, formatter=IndentedHelpFormatterWithNL())
 '''
 
-from optparse import OptionParser, IndentedHelpFormatter, textwrap
+from optparse import IndentedHelpFormatter
+import textwrap
 
 class IndentedHelpFormatterWithNL(IndentedHelpFormatter):
   def format_description(self, description):

{p2api-1.0.10 → p2api-1.0.11}/pyproject.toml

@@ -36,14 +36,11 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    #"astroplan",
-    #"astropy",
     "keyring",
     "requests",
 ]
 
 [project.scripts]
-#p2api_add_absolute_time_intervals = "p2api.utils.add_absolute_time_intervals:main"
 p2api_generate_finding_charts = "p2api.utils.generate_finding_charts:main"
 
 [project.urls]

p2api-1.0.10/p2api/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.0.10"