Merge branch 'main' into fix-pr-templates

kosmorrolib/__init__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
-from .data import Position
+from .model import Position, Event, AsterEphemerides, Object
 from .ephemerides import get_ephemerides, get_moon_phase
 from .events import get_events
+from .enum import EventType, MoonPhaseType

kosmorrolib/ephemerides.py

@@ -8,7 +8,7 @@ from skyfield.timelib import Time
 from skyfield.constants import tau
 from skyfield.errors import EphemerisRangeError
 
-from .data import Position, AsterEphemerides, MoonPhase, Object, ASTERS
+from .model import Position, AsterEphemerides, MoonPhase, Object, ASTERS
 from .dateutil import translate_to_timezone
 from .core import get_skf_objects, get_timescale, get_iau2000b
 from .enum import MoonPhaseType

kosmorrolib/events.py

@@ -7,7 +7,7 @@ from skyfield.timelib import Time
 from skyfield.searchlib import find_discrete, find_maxima, find_minima
 from numpy import pi
 
-from .data import Event, Star, Planet, ASTERS
+from .model import Event, Star, Planet, ASTERS
 from .dateutil import translate_to_timezone
 from .enum import EventType
 from .exceptions import OutOfRangeDateError

tests/data.py

@@ -1,11 +1,11 @@
 import unittest
 
-from kosmorrolib import data, core
+from kosmorrolib import model, core
 
 
 class DataTestCase(unittest.TestCase):
     def test_object_radius_must_be_set_to_get_apparent_radius(self):
-        o = data.Planet("Saturn", "SATURN")
+        o = model.Planet("Saturn", "SATURN")
 
         with self.assertRaises(ValueError) as context:
             o.get_apparent_radius(

tests/ephemerides.py

@@ -4,7 +4,7 @@ from kosmorrolib.enum import MoonPhaseType
 
 from .testutils import expect_assertions
 from kosmorrolib import ephemerides
-from kosmorrolib.data import Position, MoonPhase
+from kosmorrolib.model import Position, MoonPhase
 from datetime import date
 from kosmorrolib.exceptions import OutOfRangeDateError
 

tests/events.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 from parameterized import parameterized
 
 from kosmorrolib import events
-from kosmorrolib.data import Event, ASTERS
+from kosmorrolib.model import Event, ASTERS
 from kosmorrolib.enum import EventType
 from kosmorrolib.exceptions import OutOfRangeDateError