p2api 1.0.6__tar.gz → 1.0.7__tar.gz

{p2api-1.0.6 → p2api-1.0.7}/.gitignore

@@ -2,3 +2,4 @@ p2api.egg-info/
 dist/
 p2api/__pycache__/
 p2api/utils/__pycache__/
+*.pyc

{p2api-1.0.6 → p2api-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: p2api
-Version: 1.0.6
+Version: 1.0.7
 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.7/p2api/__about__.py

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

{p2api-1.0.6 → p2api-1.0.7}/p2api/utils/add_absolute_time_intervals.py

@@ -4,6 +4,8 @@
 from __future__ import print_function
 
 _VERSION_ = "$Revision: 267033 $"
+from ..p2api import __version__
+_VERSION_ = __version__
 
 import sys                            # interaction with Python interpreter
 from optparse import OptionParser     # for parsing command line arguments
@@ -65,7 +67,7 @@ e.g. yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm_yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm{_...}
     group.add_option("-E", "--ephem", dest="ephem", metavar="T0,PERIOD", help="Comma separated list of orbital T0[JD] and period[days] [optional]", default=None)
     group.add_option("--phase_intervals", dest="phase_intervals",  help="Comma separated list of phase intervals e.g. 0.1-0.2,0.305-0.375 [optional]", default=None)
     group.add_option("--phase_target", dest="phase_target",  help="Comma separated list of target phase, start_before [mins], min_start_before [mins] e.g. 0.01,120,30 [optional]", default=None)
-    group.add_option("--periods", dest="periods", help=f"Comma separated list of periods, default={default_eso_period} [optional]", default=str(default_eso_period))
+    group.add_option("--periods", dest="periods", help="Comma separated list of periods, default={} [optional]".format(default_eso_period), default=str(default_eso_period))
     parser.add_option_group(group)
 
     group = OptionGroup(parser, "p2 server selection, options and password management")
@@ -214,9 +216,23 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
                 checked_phase_intervals+=[p_int,]
             else :
                 if ob_exec_time < p_int_in_sec :
-                    logging.warning(f'Phase interval {p_int[0]}--{p_int[1]} == {p_int_in_sec:3.1f}sec is too short to start and finish this OB with execution time of {ob_exec_time}secs.')
+                    logging.warning(
+                        'Phase interval {}--{} == {:3.1f}sec is too short to start and finish this OB with execution time of {}secs.'.format(
+                            p_int[0],
+                            p_int[1],
+                            p_int_in_sec,
+                            ob_exec_time,
+                        )
+                    )
                 if p_int_in_sec > min_ATI_length.to_value(u.second) :
-                    logging.warning(f'Phase interval {p_int[0]}--{p_int[1]} == {p_int_in_sec:3.1f}sec is shorter than the minimum ATI length time of {min_ATI_length.to_value(u.second)}secs.')
+                    logging.warning(
+                        'Phase interval {}--{} == {:3.1f}sec is shorter than the minimum ATI length time of {}secs.'.format(
+                            p_int[0],
+                            p_int[1],
+                            p_int_in_sec,
+                            min_ATI_length.to_value(u.second),
+                        )
+                    )
 
         sf_ints=[]
         for sf_jd in sf_jds :
@@ -267,11 +283,33 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
                             sf_ints+=[sf_int,]
                         else :
                             if not int_spans_nighttime :
-                                logging.debug(f'Interval does not span any part of the night, original interval = {original_sf_int}, SSSR of previous and next nights {sssr[0][0].jd}--{sssr[0][1].jd} and {sssr[1][0].jd}--{sssr[1][1].jd}')
+                                logging.debug(
+                                    'Interval does not span any part of the night, original interval = {}, SSSR of previous and next nights {}--{} and {}--{}'.format(
+                                        original_sf_int,
+                                        sssr[0][0].jd,
+                                        sssr[0][1].jd,
+                                        sssr[1][0].jd,
+                                        sssr[1][1].jd,
+                                    )
+                                )
                             if ((sf_int[1]-sf_int[0])*24*60.*60. < ob_exec_time) :
-                                logging.debug(f'Checked Interval shorter [{(sf_int[1]-sf_int[0])*24*60.*60.:3.1f}sec] than OB execution time [{ob_exec_time:3.1f}sec], original interval = {original_sf_int}, checked interval = {sf_int}')
+                                logging.debug(
+                                    'Checked Interval shorter [{:3.1f}sec] than OB execution time [{:3.1f}sec], original interval = {}, checked interval = {}'.format(
+                                        (sf_int[1]-sf_int[0])*24*60.*60.,
+                                        ob_exec_time,
+                                        original_sf_int,
+                                        sf_int,
+                                    )
+                                )
                             if ((sf_int[1]-sf_int[0])*24*60.*60. < min_ATI_length.to_value(u.second)) :
-                                logging.debug(f'Checked Interval shorter [{(sf_int[1]-sf_int[0])*24*60.*60.:3.1f}sec] than minimum ATI length time [{min_ATI_length.to_value(u.second):3.1f}sec], original interval = {original_sf_int}, checked interval = {sf_int}')
+                                logging.debug(
+                                    'Checked Interval shorter [{:3.1f}sec] than minimum ATI length time [{:3.1f}sec], original interval = {}, checked interval = {}'.format(
+                                        (sf_int[1]-sf_int[0])*24*60.*60.,
+                                        min_ATI_length.to_value(u.second),
+                                        original_sf_int,
+                                        sf_int,
+                                    )
+                                )
                 pass
         ATCs=[Time(sf_int, format='jd') for sf_int in sf_ints]
         check_ATCs=True
@@ -290,8 +328,17 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
         if check_ATCs :
             phase_range=''
             if options.ephem is not None :
-                phase_range=f"  [Phases: {(((t[0]-Time(T0,format='jd'))/P).to_value(u.day)%1):5.3f} -- {(((t[1]-Time(T0,format='jd'))/P).to_value(u.day)%1):5.3f}]"
-            print(f"{i+1:3d} {ob_ATCs[-1]['from']} -- {ob_ATCs[-1]['to']}  [duration={((t[1]-t[0]).to_datetime())}]{phase_range}")
+                phase_range="  [Phases: {:5.3f} -- {:5.3f}]".format(
+                    (((t[0]-Time(T0,format='jd'))/P).to_value(u.day)%1),
+                    (((t[1]-Time(T0,format='jd'))/P).to_value(u.day)%1),
+                )
+            print("{:3d} {} -- {}  [duration={}]{}".format(
+                i+1,
+                ob_ATCs[-1]['from'],
+                ob_ATCs[-1]['to'],
+                ((t[1]-t[0]).to_datetime()),
+                phase_range,
+            ))
     if check_ATCs :
         '''
         logging.warning("****************************************************************************************")
@@ -313,7 +360,7 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
             print("to report/discuss the errors/problems in the above calculations.")
             print("Please include in the description the EXACT command line used to run the script.")
             sys.exit(0)
-            #raise Exception(f"Aborted.")
+            #raise Exception("Aborted.")
     return ob_ATCs
 # ------------------------------------------------------------------------------
 def oneOB( api, obId ) :

{p2api-1.0.6 → p2api-1.0.7}/p2api/utils/generate_finding_charts.py

@@ -4,6 +4,8 @@
 from __future__ import print_function
 
 _VERSION_ = "$Revision: 267033 $"
+from ..p2api import __version__
+_VERSION_ = __version__
 
 import sys                            # interaction with Python interpreter
 from optparse import OptionParser     # for parsing command line arguments

{p2api-1.0.6 → p2api-1.0.7}/p2api/utils/p2api_utils.py

@@ -59,7 +59,7 @@ def ESO_period_start_end_dates(P):
     md1=ESO_period_first_last_dates[P%2][0]
     y2=1967+(P+2)//2
     md2=ESO_period_first_last_dates[P%2][1]
-    return [f"{y1}{md1}",f"{y2}{md2}"]
+    return ["{}{}".format(y1,md1),"{y2}{md2}.format(y2,md2)"]
 # ---------------------------------------------------------------------------------------
 def ESO_period_start_end_datetimes(P):
     ESO_period_first_last_dates=[
@@ -70,7 +70,7 @@ def ESO_period_start_end_datetimes(P):
     md1=ESO_period_first_last_dates[P%2][0]
     y2=1967+(P+2)//2
     md2=ESO_period_first_last_dates[P%2][1]
-    return [f"{y1}{md1}",f"{y2}{md2}"]
+    return ["{}{}".format(y1,md1),"{y2}{md2}.format(y2,md2)"]
 # ---------------------------------------------------------------------------------------
 def get_attrs(klass):
   return [k for k in klass.__dict__.keys()
@@ -280,8 +280,8 @@ def decode_datetime( d ) :
     d_tz=d
     for tz in tz_info :
         d_tz=re.sub(
-            f'{tz}',
-            f'{tz_info[tz]}',
+            '{}.format(tz)',
+            '{}.format(tz_info[tz])',
             d_tz,
         )
     for s in [d_tz,d] :
@@ -300,5 +300,5 @@ def decode_datetime( d ) :
                 return dt
             except :
                 pass
-    raise Exception(f"Could not decode date '{d}'.")
+    raise Exception("Could not decode date '{}'.".format(d))
 # ---------------------------------------------------------------------------------------

{p2api-1.0.6 → p2api-1.0.7}/pyproject.toml

@@ -55,4 +55,6 @@ path = "p2api/__about__.py"
 [tool.hatch.build.targets.sdist]
 include = [
     "/p2api",
+    "/setup.py",
+    "/setup.cfg",
 ]

p2api-1.0.7/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

p2api-1.0.7/setup.py

@@ -0,0 +1,127 @@
+from setuptools import setup
+import os
+import io
+
+'''
+Restored setup.py & setup.cfg following instructions at:
+Follow instructions at https://stackoverflow.com/questions/42287533/restore-deleted-file-with-history-in-git
+
+git config --get remote.origin.url
+git checkout a53fb714b8b48cd0112ae175a179e4a2c6859de1 -b restore_setuptools_build_support
+git mv setup.py setup_1.py
+git mv setup.cfg setup_1.cfg
+git commit -m "Move file (1)"
+SAVED=`git rev-parse HEAD`
+git reset --hard "HEAD^"
+git mv setup.py setup_2.py
+git mv setup.cfg setup_2.cfg
+git commit -m "Move file (2)"
+git merge $SAVED
+git commit -a -n
+git checkout master
+git merge restore_setuptools_build_support
+git commit -a -n
+git rm setup_1.py setup_1.cfg
+git mv setup_2.py setup.py 
+git mv setup_2.cfg setup.cfg
+git commit -m "recovery finished"
+'''
+
+
+# ----------------------------------------------------
+def read(*paths, **kwargs):
+    """Read the contents of a text file safely.
+    >>> read("p2api", "VERSION")
+    '0.1.0'
+    >>> read("README.md")
+    ...
+    """
+    content = ""
+    with io.open(
+        os.path.join(os.path.dirname(__file__), *paths),
+        encoding=kwargs.get("encoding", "utf8"),
+    ) as open_file:
+        content = open_file.read().strip()
+    return content
+# ----------------------------------------------------
+from p2api import __about__
+setup(
+    name='p2api',
+    #version=read('p2api', 'VERSION'),
+    version=__about__.__version__,
+    description='Binding for the ESO phase 2 programmatic API',
+    long_description=read('README.md'),
+    long_description_content_type='text/markdown',
+    url='https://www.eso.org/copdemo/apidoc/index.html',
+    author='Thomas Bierwirth',
+    author_email='thomas.bierwirth@eso.org',
+
+    packages=['p2api', 'p2api/utils',],
+    include_package_data=True,
+    entry_points={
+        'console_scripts' : [
+            'p2api_generate_finding_charts = p2api.utils.generate_finding_charts:main',
+            'p2api_add_absolute_time_intervals = p2api.utils.add_absolute_time_intervals:main',
+        ],
+    },
+
+    # Classifiers help users find your project by categorizing it.
+    #
+    # For a list of valid classifiers, see
+    # https://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[  # Optional
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
+        'Development Status :: 5 - Production/Stable',
+
+        # Indicate who your project is intended for
+        'Intended Audience :: Developers',
+
+        # Pick your license as you wish
+        'License :: OSI Approved :: MIT License',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+    ],
+
+    # This field adds keywords for your project which will appear on the
+    # project page. What does your project relate to?
+    #
+    # Note that this is a string of words separated by whitespace, not a list.
+    keywords='ESO Phase2 Observation Preparation Programmatic API',
+
+    # You can just specify package directories manually here if your project is
+    # simple. Or you can use find_packages().
+    #
+    # Alternatively, if you just want to distribute a single Python file, use
+    # the `py_modules` argument instead as follows, which will expect a file
+    # called `my_module.py` to exist:
+    #
+    py_modules=["p2api"],
+
+    # This field lists other packages that your project depends on to run.
+    # Any package you put here will be installed by pip when your project is
+    # installed, so they must be valid existing projects.
+    #
+    # For an analysis of "install_requires" vs pip's requirements files see:
+    # https://packaging.python.org/en/latest/requirements.html
+    install_requires=[
+        'requests',
+        'keyring',
+        'astropy', ## needed for add_absolute_time_intervals
+        'astroplan', ## needed for add_absolute_time_intervals
+    ],
+    license='MIT'
+)

p2api-1.0.6/p2api/__about__.py

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