p2api 1.0.7__tar.gz → 1.0.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: p2api
-Version: 1.0.7
+Version: 1.0.8
 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>
@@ -40,8 +40,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: astroplan
-Requires-Dist: astropy
 Requires-Dist: keyring
 Requires-Dist: requests
 Description-Content-Type: text/markdown

p2api-1.0.8/p2api/__about__.py

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

{p2api-1.0.7 → p2api-1.0.8}/p2api/p2api.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 This file provides an example binding to ESO's RESTful phase 2 programmatic interface.
 The data required and returned by many of the API calls is instrument-specific.
@@ -141,6 +142,7 @@ class ApiConnection(object):
                 raise P2Error(500, 'POST', param_values['environment'], 'environment not supported')
             self.apiUrl = API_URL[param_values['environment']]
             self.loginUrl = LOGIN_URL[param_values['environment']]
+            self.p2fc_url = P2FC_URL[param_values['environment']]
             self.session = self.requests_retry_session()
 
             r = requests.post(
@@ -168,6 +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.access_token = kwargs['access_token']
             self.session = self.requests_retry_session()
         else :

{p2api-1.0.7 → p2api-1.0.8}/p2api/utils/__init__.py

@@ -1 +1,2 @@
 # $Id: __init__.py 244843 2019-09-12 07:31:09Z jpritcha $
+# -*- coding: utf-8 -*-

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

@@ -1,10 +1,14 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 
 # $Id: generate_finding_charts.py 267033 2021-09-16 11:08:57Z jpritcha $
 from __future__ import print_function
 
 _VERSION_ = "$Revision: 267033 $"
-from ..p2api import __version__
+try:
+    from ..p2api import __version__
+except:
+    from p2api.__about__ import __version__
 _VERSION_ = __version__
 
 import sys                            # interaction with Python interpreter
@@ -65,11 +69,26 @@ e.g. yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm_yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm{_...}
 
     group = OptionGroup(parser, "Specify the Absolute Time Intervals using an orbital ephemeris. This functionality is EXPERIMENTAL, please check carefully!!!")
     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_intervals",
+        dest="phase_intervals",
+        help="""\
+Comma separated list of phase intervals e.g. 0.1-0.2,0.305-0.375 [optional].
+Remember that ATCs specify the intervals during which the OBs must be started.
+This code however interprets the phase intervals as the intervals during which the OB must start AND finish. \
+Therefore the ending phase intervals of the ATCs that will be added to the OBs will always be \
+less than the phase intervals specified.\
+""",
+        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="Comma separated list of periods, default={} [optional]".format(default_eso_period), default=str(default_eso_period))
     parser.add_option_group(group)
 
+    group = OptionGroup(parser, "Do NOT check ATCs for experimental methods.")
+    group.add_option("--NO_checkATCs", dest="NO_checkATCs", help="Do NOT check ATCs for experimental methods.", action="store_true", default=False)
+    parser.add_option_group(group)
+
     group = OptionGroup(parser, "p2 server selection, options and password management")
     group.add_option("--env", dest="env", help="Use the %s environment [optional], default = production" %("|".join(p2api.API_URL.keys())), default='production')
     group.add_option("-u", "--user", dest="user", metavar="USER", help="the User Portal account of the user to use, e.g. ASMITHSONIAN [required for production (not required for demo)]", default=None)
@@ -123,6 +142,8 @@ e.g. yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm_yyyy-mm-ddThh:mm,yyyy-mm-ddThh:mm{_...}
     self.phase_intervals = options.phase_intervals
     self.phase_target = options.phase_target
 
+    self.NO_checkATCs = options.NO_checkATCs
+
     self.user = options.user
     self.env = options.env
     self.pwstore = options.pwstore
@@ -151,7 +172,7 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
     if options.ATCs is not None :
         ATCs=[
             [p2api_utils.decode_datetime(x.split(',')[0]),p2api_utils.decode_datetime(x.split(',')[1])]
-            for x in options.ATCs.splt('_')
+            for x in options.ATCs.split('_')
         ]
 
     elif options.file is not None :
@@ -257,22 +278,25 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
                             int_spans_nighttime=False
                             for which in ['previous','next',] :
                                 sun_set_time=telescope.sun_set_time(Time(sf_int[0], format='jd'), which=which)
-                                sun_rise_time=telescope.sun_rise_time(sun_set_time, which='next')
-                                sssr+=[[sun_set_time,sun_rise_time],]
-                                if (
-                                    (sf_int[0] > sun_set_time.jd and sf_int[0] < sun_rise_time.jd-ob_exec_time/24./60./60. )
-                                    or
-                                    (sf_int[1] > sun_set_time.jd and sf_int[1] < sun_rise_time.jd-ob_exec_time/24./60./60. )
-                                    or
-                                    (sf_int[0] < sun_set_time.jd and sf_int[1] > sun_rise_time.jd-ob_exec_time/24./60./60. )
-                                ) :
-                                    sf_int=[
-                                        np.max([sf_int[0],sun_set_time.jd]),
-                                        np.min([sf_int[1],sun_rise_time.jd-ob_exec_time/24./60./60.,sun_rise_time.jd-post_ob_exec_time/24./60./60.]),
-                                    ]
-                                    if sf_int[1] > sf_int[0]+min_start_before/24./60. :
-                                        int_spans_nighttime=True                                    
-                                        break
+                                if isinstance(sun_set_time.value,np.float64) :
+                                    sun_rise_time=telescope.sun_rise_time(sun_set_time, which='next')
+                                    sssr+=[[sun_set_time,sun_rise_time],]
+                                    if (
+                                        (sf_int[0] > sun_set_time.jd and sf_int[0] < sun_rise_time.jd-ob_exec_time/24./60./60. )
+                                        or
+                                        (sf_int[1] > sun_set_time.jd and sf_int[1] < sun_rise_time.jd-ob_exec_time/24./60./60. )
+                                        or
+                                        (sf_int[0] < sun_set_time.jd and sf_int[1] > sun_rise_time.jd-ob_exec_time/24./60./60. )
+                                    ) :
+                                        sf_int=[
+                                            np.max([sf_int[0],sun_set_time.jd]),
+                                            np.min([sf_int[1],sun_rise_time.jd-ob_exec_time/24./60./60.,sun_rise_time.jd-post_ob_exec_time/24./60./60.]),
+                                        ]
+                                        if sf_int[1] > sf_int[0]+min_start_before/24./60. :
+                                            int_spans_nighttime=True                                    
+                                            break
+                                else :
+                                    logging.error(f"telescope.sun_set_time(Time({sf_int[0]}, format='jd'), which={which}) did not return np.float64 ")
                         if (
                             int_spans_nighttime
                             and
@@ -332,10 +356,11 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
                     (((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(
+            print("{:3d} {} -- {}  [OB_exectime={}, Int.duration={}]{}".format(
                 i+1,
                 ob_ATCs[-1]['from'],
                 ob_ATCs[-1]['to'],
+                datetime.timedelta(seconds=ob_exec_time),
                 ((t[1]-t[0]).to_datetime()),
                 phase_range,
             ))
@@ -353,14 +378,19 @@ def get_ob_ATCs(telescope=None, ob_info=None, run_info=None) :
         print("****************************************************************************************")
         print("Intervals via Orbital Ephemeris functionality is EXPERIMENTAL")
         print("Please check the above intervals carefully and only continue if you are sure they are what YOU require.")
-        print("YOU, and YOU ALONE are responsible for the accuracy of these intervals.")
-        yorn = input("Continue [y/N] ")
-        if yorn.lower() not in ['y',] :
-            print("Please contact ESO User Support via a ticket at https://support.eso.org/tickets")
-            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("Aborted.")
+        print("Remember that ATCs specify the intervals during which the OBs must be started.")
+        print("While this code interprets the phase intervals as the intervals during which the OB must start AND finish.")
+        print("Therefore the ending phase intervals of the ATCs listed above will always be")
+        print("less than the phase intervals specified.")
+        print("Ultimately YOU, and YOU ALONE, are responsible for the accuracy of these intervals.")
+        if not options.NO_checkATCs :
+            yorn = input("Continue [y/N] ")
+            if yorn.lower() not in ['y',] :
+                print("Please contact ESO User Support via a ticket at https://support.eso.org/tickets")
+                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("Aborted.")
     return ob_ATCs
 # ------------------------------------------------------------------------------
 def oneOB( api, obId ) :

p2api-1.0.8/p2api/utils/eso_period.py

@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+import datetime
+import copy
+
+# ---------------------------------------------------------------------------------------
+## From https://stackoverflow.com/questions/51913210/python-script-with-timezone-fails-when-back-ported-to-python-2-7
+ZERO = datetime.timedelta(0)
+HOUR = datetime.timedelta(hours=1)
+
+class UTC(datetime.tzinfo):
+    """UTC"""
+
+    def utcoffset(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return ZERO
+
+tz_utc=UTC()
+if hasattr(datetime,'timezone') :
+    if hasattr(datetime.timezone,'utc') :
+        tz_utc=datetime.timezone.utc
+# ---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
+def get_ESO_period( d ):
+    """
+    Return the (int) ESO period for a specified datetime.date or datetime.datetime
+    If d is naive (no timezone), UTC is assumed
+    """
+    ## ToDo: Update this method when we go to yearly cycle!
+    ## 2024-07: currently planned for P117, with P116 lasting 7 months...
+    # 113 2024-04 -- 2024-09
+    # 114 2024-10 -- 2025-03
+    # 115 2025-04 -- 2026-09
+    # 116 2025-10 -- 2026-04
+    # 117 2026-05 -- 2027-04
+    # 118 2027-05 -- 2028-04
+    # ...
+    if isinstance(d,datetime.date) :
+        d=datetime.datetime(
+            year=d.year,
+            month=d.month,
+            day=d.day,
+            hour=0,
+            minute=0,
+            second=0,
+            microsecond=0,
+            tzinfo=tz_utc,
+        )
+    if d.tzinfo is None :
+        d=d.replace(tzinfo=tz_utc)
+    if d < datetime.datetime(2025,10,1,0,0,tzinfo=tz_utc) :
+        # P < 116...
+        return ((d.year-2012)+44)*2+int(float(d.month+2)/6.)
+    elif d > datetime.datetime(2026,5,1,0,0,tzinfo=tz_utc) :
+        # P > 116...
+        return ((d.year-2026)+116)+int(float(d.month+7)/12.)
+    elif d > datetime.datetime(2026,4,1,0,0,tzinfo=tz_utc) :
+        ## Special case for 7month long P116
+        return ((d.year-2012)+44)*2+int(float(d.month+2)/7.)  
+    return ((d.year-2012)+44)*2+int(float(d.month+2)/6.)
+# ---------------------------------------------------------------------------------------
+def current_ESO_period( days_from_now=0, dt=None ):
+    d=datetime.datetime.now(tz_utc) + datetime.timedelta(days=days_from_now)
+    return get_ESO_period(d)
+# ---------------------------------------------------------------------------------------
+def ESO_period_datetime_start( eso_period=current_ESO_period() ):
+    ## ToDo: Update this method when we go to yearly cycle!
+    ## 2024-07: currently planned for P117, with P116 lasting 7 months...
+    ## i.e.
+    ## P115 starts 
+    if eso_period < 116 :
+        y=2024+(eso_period-113)//2
+        m=4+6*((eso_period-113)%2)
+    elif eso_period > 116 :
+        y=2026+(eso_period-117)
+        m=5
+    else :
+        y=2025
+        m=10
+    return datetime.datetime(y,m,1,0,0,0,0,tzinfo=tz_utc)
+# ---------------------------------------------------------------------------------------
+def ESO_period_datetime_end( eso_period=current_ESO_period() ):
+    return ESO_period_datetime_start((eso_period or current_ESO_period())+1)-datetime.timedelta(days=1)
+# ---------------------------------------------------------------------------------------
+def ESO_period_date_start( eso_period=current_ESO_period() ):
+    return ESO_period_datetime_start( eso_period ).date()
+# ---------------------------------------------------------------------------------------
+def ESO_period_date_end( eso_period=current_ESO_period() ):
+    return ESO_period_datetime_end( eso_period ).date()
+# ---------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
+if __name__ == '__main__' :
+    ## ToDo: These tests, should be moved to proper tests...
+
+    ## Testing get_ESO_period
+    ## verify input date type is not changed
+    d=datetime.date(2024,4,1)
+    get_ESO_period(d)
+    assert isinstance(d,datetime.date)
+    
+    # verify input datetime tzinfo is not modified
+    d=datetime.datetime(2024,4,1,0,0)
+    get_ESO_period(d)
+    assert d.tzinfo is None
+
+    # P113
+    assert get_ESO_period(datetime.date(2024,4,1))               == 113
+    assert get_ESO_period(datetime.datetime(2024,4,1,0,0))       == 113
+    assert get_ESO_period(datetime.datetime(2024,9,30,23,59,59)) == 113
+    # P114
+    assert get_ESO_period(datetime.datetime(2024,10,1,0,0))      == 114
+    assert get_ESO_period(datetime.datetime(2025,3,31,23,59,59)) == 114
+    # P115
+    assert get_ESO_period(datetime.datetime(2025,4,1,0,0))       == 115
+    assert get_ESO_period(datetime.datetime(2025,9,30,23,59,59)) == 115
+    # P116
+    assert get_ESO_period(datetime.datetime(2025,10,1,0,0))      == 116
+    assert get_ESO_period(datetime.datetime(2026,3,31,23,59,59)) == 116
+    assert get_ESO_period(datetime.datetime(2026,4,30,23,59,59)) == 116
+    # P117
+    assert get_ESO_period(datetime.datetime(2026,5,1,0,0))       == 117
+    assert get_ESO_period(datetime.datetime(2027,4,30,23,59,59)) == 117
+    # P118
+    assert get_ESO_period(datetime.datetime(2027,5,1,0,0))       == 118
+    assert get_ESO_period(datetime.datetime(2028,4,30,23,59,59)) == 118
+
+    ## testing ESO_period_date_start() & ESO_period_date_end()
+    # P113
+    assert ESO_period_date_start(113) == datetime.date(2024,4,1)
+    assert ESO_period_date_end(113)   == datetime.date(2024,9,30)
+    # P114
+    assert ESO_period_date_start(114) == datetime.date(2024,10,1)
+    assert ESO_period_date_end(114)   == datetime.date(2025,3,31)
+    # P115
+    assert ESO_period_date_start(115) == datetime.date(2025,4,1)
+    assert ESO_period_date_end(115)   == datetime.date(2025,9,30)
+    # P116
+    assert ESO_period_date_start(116) == datetime.date(2025,10,1)
+    assert ESO_period_date_end(116)   == datetime.date(2026,4,30)
+    # P117
+    assert ESO_period_date_start(117) == datetime.date(2026,5,1)
+    assert ESO_period_date_end(117)   == datetime.date(2027,4,30)
+    # P118
+    assert ESO_period_date_start(118) == datetime.date(2027,5,1)
+    assert ESO_period_date_end(118)   == datetime.date(2028,4,30)

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

@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+# -*- coding: utf-8 -*-
 
 # $Id: generate_finding_charts.py 267033 2021-09-16 11:08:57Z jpritcha $
 from __future__ import print_function

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 import logging
 import p2api
@@ -7,44 +8,50 @@ import getpass
 import keyring
 import re
 
-import astropy.units as u
-from astropy.coordinates import EarthLocation
+from p2api.utils.eso_period import *
 
-# The GPS coordinates of the UTs
-# https://www.eso.org/sci/facilities/paranal/astroclimate/site.html
-UT1_loc = EarthLocation.from_geodetic('-70d24m18.27s', '-24d37m39.44s', (2635.43+13.044)*u.m)
-UT2_loc = EarthLocation.from_geodetic('-70d24m17.39s', '-24d37m37.80s', (2635.43+13.044)*u.m)
-UT3_loc = EarthLocation.from_geodetic('-70d24m16.32s', '-24d37m36.64s', (2635.43+13.044)*u.m)
-UT4_loc = EarthLocation.from_geodetic('-70d24m14.25s', '-24d37m37.36s', (2635.43+13.044)*u.m)
-VST_loc = EarthLocation.from_geodetic('-70d24m14.27s', '-24d37m34.79s', (2635.43+4.5399)*u.m)
-VISTA_loc = EarthLocation.from_geodetic('-70d23m51.36s', '-24d36m56.52s', (2530.)*u.m)
+try:
+    import astropy.units as u
+    from astropy.coordinates import EarthLocation
+    # The GPS coordinates of the UTs
+    # https://www.eso.org/sci/facilities/paranal/astroclimate/site.html
+    UT1_loc = EarthLocation.from_geodetic('-70d24m18.27s', '-24d37m39.44s', (2635.43+13.044)*u.m)
+    UT2_loc = EarthLocation.from_geodetic('-70d24m17.39s', '-24d37m37.80s', (2635.43+13.044)*u.m)
+    UT3_loc = EarthLocation.from_geodetic('-70d24m16.32s', '-24d37m36.64s', (2635.43+13.044)*u.m)
+    UT4_loc = EarthLocation.from_geodetic('-70d24m14.25s', '-24d37m37.36s', (2635.43+13.044)*u.m)
+    VST_loc = EarthLocation.from_geodetic('-70d24m14.27s', '-24d37m34.79s', (2635.43+4.5399)*u.m)
+    VISTA_loc = EarthLocation.from_geodetic('-70d23m51.36s', '-24d36m56.52s', (2530.)*u.m)
 
-# https://www.eso.org/sci/facilities/lasilla/telescopes/3p6/overview.html
-## The telescope is at a geographical location of:
-## 70° 43' 54.1" W  -29° 15' 39.5" S (WGS84), 2400 metres above sea level
-LS3p6_loc = EarthLocation.from_geodetic('-70d43m54.1s', '-29d15m39.5s', (2400.)*u.m)
+    # https://www.eso.org/sci/facilities/lasilla/telescopes/3p6/overview.html
+    ## The telescope is at a geographical location of:
+    ## 70° 43' 54.1" W  -29° 15' 39.5" S (WGS84), 2400 metres above sea level
+    LS3p6_loc = EarthLocation.from_geodetic('-70d43m54.1s', '-29d15m39.5s', (2400.)*u.m)
 
-# https://www.eso.org/sci/facilities/lasilla/telescopes/ntt/overview.html
-## 70° 44' 01.5" W  -29° 15' 32.1" S (WGS84), 2375m
-LSntt_loc = EarthLocation.from_geodetic('-70d44m01.5s', '-29d15m32.1s', (2375.)*u.m)
+    # https://www.eso.org/sci/facilities/lasilla/telescopes/ntt/overview.html
+    ## 70° 44' 01.5" W  -29° 15' 32.1" S (WGS84), 2375m
+    LSntt_loc = EarthLocation.from_geodetic('-70d44m01.5s', '-29d15m32.1s', (2375.)*u.m)
 
-# https://www.eso.org/sci/facilities/lasilla/telescopes/national/2p2.html
-# 2p2 70°44'4"543 W 29°15'15"433 S
-LS2p2_loc = EarthLocation.from_geodetic('-70d44m04.543s', '-29d15m15.433s', (2335.)*u.m)
-
-## All together as a dictionary:
-telescope_locations={
-    'UT1': UT1_loc,
-    'UT2': UT2_loc,
-    'UT3': UT3_loc,
-    'UT4': UT4_loc,
-    'VST': VST_loc,
-    'VISTA': VISTA_loc,
-    'LS3p6': LS3p6_loc,
-    'LSntt': LSntt_loc,
-    'LS2p2': LS2p2_loc,
-}
+    # https://www.eso.org/sci/facilities/lasilla/telescopes/national/2p2.html
+    # 2p2 70°44'4"543 W 29°15'15"433 S
+    LS2p2_loc = EarthLocation.from_geodetic('-70d44m04.543s', '-29d15m15.433s', (2335.)*u.m)
 
+    ## All together as a dictionary:
+    telescope_locations={
+        'UT1': UT1_loc,
+        'UT2': UT2_loc,
+        'UT3': UT3_loc,
+        'UT4': UT4_loc,
+        'VST': VST_loc,
+        'VISTA': VISTA_loc,
+        'LS3p6': LS3p6_loc,
+        'LSntt': LSntt_loc,
+        'LS2p2': LS2p2_loc,
+    }
+except:
+    pass
+'''
+## ToDo: make usd_config module public...
+## use local copy (for now) of usd_config.eso_period
 # ---------------------------------------------------------------------------------------
 def current_ESO_period():
     d=datetime.datetime.utcnow()
@@ -71,6 +78,19 @@ 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 [
+        ESO_period_date_start(P),
+        ESO_period_date_end(P),
+    ]
+# ---------------------------------------------------------------------------------------
+def ESO_period_start_end_datetimes(P):
+    return [
+        ESO_period_datetime_start(P),
+        ESO_period_datetime_end(P),
+    ]
 # ---------------------------------------------------------------------------------------
 def get_attrs(klass):
   return [k for k in klass.__dict__.keys()

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

@@ -36,14 +36,14 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "astroplan",
-    "astropy",
+    #"astroplan",
+    #"astropy",
     "keyring",
     "requests",
 ]
 
 [project.scripts]
-p2api_add_absolute_time_intervals = "p2api.utils.add_absolute_time_intervals:main"
+#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.7 → p2api-1.0.8}/setup.py

@@ -60,8 +60,8 @@ setup(
     include_package_data=True,
     entry_points={
         'console_scripts' : [
+            #'p2api_add_absolute_time_intervals = p2api.utils.add_absolute_time_intervals:main',
             'p2api_generate_finding_charts = p2api.utils.generate_finding_charts:main',
-            'p2api_add_absolute_time_intervals = p2api.utils.add_absolute_time_intervals:main',
         ],
     },
 
@@ -120,8 +120,8 @@ setup(
     install_requires=[
         'requests',
         'keyring',
-        'astropy', ## needed for add_absolute_time_intervals
-        'astroplan', ## needed for add_absolute_time_intervals
+        #'astropy', ## needed for add_absolute_time_intervals
+        #'astroplan', ## needed for add_absolute_time_intervals
     ],
     license='MIT'
 )

p2api-1.0.7/p2api/__about__.py

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