wintertoo 1.5.0__tar.gz → 1.6.0__tar.gz

{wintertoo-1.5.0 → wintertoo-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.5.0
+Version: 1.6.0
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo
@@ -22,8 +22,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
-Requires-Dist: astropy
-Requires-Dist: astroplan
+Requires-Dist: astropy>=6.0.0
+Requires-Dist: astroplan>=0.10
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pytz

{wintertoo-1.5.0 → wintertoo-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wintertoo"
-version = "1.5.0"
+version = "1.6.0"
 description = ""
 authors = [
     {name = "Robert Stein", email = "rdstein@caltech.edu"},
@@ -32,8 +32,8 @@ classifiers = [
 ]
 dependencies = [
     "pandas",
-    "astropy",
-    "astroplan",
+    "astropy>=6.0.0",
+    "astroplan>=0.10",
     "matplotlib",
     "numpy",
     "pytz",
@@ -96,3 +96,6 @@ disable=["logging-fstring-interpolation"]
 good-names=["ax", "ra", "df", "pi", "i"]
 exclude-too-few-public-methods=["pydantic.*"]
 extension-pkg-whitelist=["pydantic"]
+
+[tool.pylint.typecheck]
+generated-members=["u.*"]

{wintertoo-1.5.0 → wintertoo-1.6.0}/tests/testdata/test_schedule.json

@@ -1 +1 @@
-{"targName":{"0":null,"1":null,"2":null,"3":null},"raDeg":{"0":173.7056754,"1":173.7056754,"2":173.7056754,"3":173.7056754},"decDeg":{"0":11.253441,"1":11.253441,"2":11.253441,"3":11.253441},"fieldID":{"0":999999999,"1":999999999,"2":999999999,"3":999999999},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":960.0,"1":960.0,"2":960.0,"3":960.0},"singleExpTime":{"0":120.0,"1":120.0,"2":120.0,"3":120.0},"priority":{"0":50.0,"1":50.0,"2":50.0,"3":50.0},"progPI":{"0":"Stein","1":"Stein","2":"Stein","3":"Stein"},"progName":{"0":"2021A000","1":"2021A000","2":"2021A000","3":"2021A000"},"progID":{"0":1,"1":1,"2":1,"3":1},"validStart":{"0":62721.1894969287,"1":62721.1894969287,"2":62721.1894969287,"3":62721.1894969287},"validStop":{"0":62722.1894969452,"1":62722.1894969452,"2":62722.1894969452,"3":62722.1894969452},"observed":{"0":false,"1":false,"2":false,"3":false},"maxAirmass":{"0":2.0,"1":2.0,"2":2.0,"3":2.0},"ditherNumber":{"0":8,"1":8,"2":8,"3":8},"ditherStepSize":{"0":30.0,"1":30.0,"2":30.0,"3":30.0},"bestDetector":{"0":true,"1":true,"2":true,"3":true},"obsHistID":{"0":0,"1":1,"2":2,"3":3}}
+{"targName":{"0":null,"1":null,"2":null,"3":null},"raDeg":{"0":173.7056754,"1":173.7056754,"2":173.7056754,"3":173.7056754},"decDeg":{"0":11.253441,"1":11.253441,"2":11.253441,"3":11.253441},"fieldID":{"0":999999999,"1":999999999,"2":999999999,"3":999999999},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":960.0,"1":960.0,"2":960.0,"3":960.0},"singleExpTime":{"0":120.0,"1":120.0,"2":120.0,"3":120.0},"priority":{"0":50.0,"1":50.0,"2":50.0,"3":50.0},"progPI":{"0":"Stein","1":"Stein","2":"Stein","3":"Stein"},"progName":{"0":"2021A000","1":"2021A000","2":"2021A000","3":"2021A000"},"progID":{"0":1,"1":1,"2":1,"3":1},"validStart":{"0":62721.1894969287,"1":62721.1894969287,"2":62721.1894969287,"3":62721.1894969287},"validStop":{"0":62722.1894969452,"1":62722.1894969452,"2":62722.1894969452,"3":62722.1894969452},"observed":{"0":false,"1":false,"2":false,"3":false},"maxAirmass":{"0":2.0,"1":2.0,"2":2.0,"3":2.0},"ditherNumber":{"0":8,"1":8,"2":8,"3":8},"ditherStepSize":{"0":90.0,"1":90.0,"2":90.0,"3":90.0},"bestDetector":{"0":true,"1":true,"2":true,"3":true},"obsHistID":{"0":0,"1":1,"2":2,"3":3}}

{wintertoo-1.5.0 → wintertoo-1.6.0}/wintertoo/data/observing_request_schema.json

@@ -15,7 +15,7 @@
     "observed": {"anyOf": [{"type":  "boolean", "default":  false}, {"type" : "integer", "minimum" : 0, "maximum" : 1}]},
     "maxAirmass": {"type":  "number", "comment": "Maximum airmass for observation", "default":  2.0},
     "ditherNumber": {"type": "integer", "default": 8},
-    "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 30.0},
+    "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 90.0},
     "fieldID": {"type": "integer", "default": 999999999},
     "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817", "default": null},
     "bestDetector": {"type": "boolean", "comment": "Center Ra/Dec of target on best detector", "default": true}

{wintertoo-1.5.0 → wintertoo-1.6.0}/wintertoo/models/image.py

@@ -31,12 +31,12 @@ class ProgramImageQuery(BaseModel):
     )
     start_date: int = Field(
         title="Start date for images",
-        default=get_date(Time.now() - 30.0 * u.day),
+        default=None,
         examples=[get_date(Time.now() - 30.0 * u.day), "20230601"],
     )
     end_date: int = Field(
         title="End date for images",
-        default=get_date(Time.now()),
+        default=None,
         examples=[get_date(Time.now() - 30.0 * u.day), get_date(Time.now())],
     )
     image_type: WinterImageTypes = Field(
@@ -52,6 +52,12 @@ class ProgramImageQuery(BaseModel):
 
         :return: validated field value
         """
+        if self.start_date is None:
+            self.start_date = get_date(Time.now() - 30.0 * u.day)
+
+        if self.end_date is None:
+            self.end_date = get_date(Time.now())
+
         if self.start_date > self.end_date:
             raise WinterValidationError("Start date is after end date")
 

{wintertoo-1.5.0 → wintertoo-1.6.0}/wintertoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.5.0
+Version: 1.6.0
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo
@@ -22,8 +22,8 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas
-Requires-Dist: astropy
-Requires-Dist: astroplan
+Requires-Dist: astropy>=6.0.0
+Requires-Dist: astroplan>=0.10
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pytz

{wintertoo-1.5.0 → wintertoo-1.6.0}/wintertoo.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pandas
-astropy
-astroplan
+astropy>=6.0.0
+astroplan>=0.10
 matplotlib
 numpy
 pytz