jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-14 16:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Astral to 2.2 (#48573)

Browse Source
This commit is contained in:
FMKaiba 2021-04-01 15:29:08 -07:00 committed by GitHub
parent e76503ddc3
commit 09eb74fd9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 211 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/moon/sensor.py
View File

@ -1,5 +1,5 @@
"""Support for tracking the moon phases.""" """Support for tracking the moon phases."""
from astral import Astral from astral import moon
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
@ -48,7 +48,6 @@ class MoonSensor(SensorEntity):
"""Initialize the moon sensor.""" """Initialize the moon sensor."""
self._name = name self._name = name
self._state = None self._state = None
self._astral = Astral()
@property @property
def name(self): def name(self):
@ -87,4 +86,4 @@ class MoonSensor(SensorEntity):
async def async_update(self): async def async_update(self):
"""Get the time and updates the states.""" """Get the time and updates the states."""
today = dt_util.as_local(dt_util.utcnow()).date() today = dt_util.as_local(dt_util.utcnow()).date()
self._state = self._astral.moon_phase(today) self._state = moon.phase(today)

20
homeassistant/components/sun/__init__.py
View File

@ -92,6 +92,7 @@ class Sun(Entity):
"""Initialize the sun.""" """Initialize the sun."""
self.hass = hass self.hass = hass
self.location = None self.location = None
self.elevation = 0.0
self._state = self.next_rising = self.next_setting = None self._state = self.next_rising = self.next_setting = None
self.next_dawn = self.next_dusk = None self.next_dawn = self.next_dusk = None
self.next_midnight = self.next_noon = None self.next_midnight = self.next_noon = None
@ -100,10 +101,11 @@ class Sun(Entity):
self._next_change = None self._next_change = None
def update_location(_event): def update_location(_event):
location = get_astral_location(self.hass) location, elevation = get_astral_location(self.hass)
if location == self.location: if location == self.location:
return return
self.location = location self.location = location
self.elevation = elevation
self.update_events() self.update_events()
update_location(None) update_location(None)
@ -140,7 +142,7 @@ class Sun(Entity):
def _check_event(self, utc_point_in_time, sun_event, before): def _check_event(self, utc_point_in_time, sun_event, before):
next_utc = get_location_astral_event_next( next_utc = get_location_astral_event_next(
self.location, sun_event, utc_point_in_time self.location, self.elevation, sun_event, utc_point_in_time
) )
if next_utc < self._next_change: if next_utc < self._next_change:
self._next_change = next_utc self._next_change = next_utc
@ -169,7 +171,7 @@ class Sun(Entity):
) )
self.location.solar_depression = -10 self.location.solar_depression = -10
self._check_event(utc_point_in_time, "dawn", PHASE_SMALL_DAY) self._check_event(utc_point_in_time, "dawn", PHASE_SMALL_DAY)
self.next_noon = self._check_event(utc_point_in_time, "solar_noon", None) self.next_noon = self._check_event(utc_point_in_time, "noon", None)
self._check_event(utc_point_in_time, "dusk", PHASE_DAY) self._check_event(utc_point_in_time, "dusk", PHASE_DAY)
self.next_setting = self._check_event( self.next_setting = self._check_event(
utc_point_in_time, SUN_EVENT_SUNSET, PHASE_SMALL_DAY utc_point_in_time, SUN_EVENT_SUNSET, PHASE_SMALL_DAY
@ -180,9 +182,7 @@ class Sun(Entity):
self._check_event(utc_point_in_time, "dusk", PHASE_NAUTICAL_TWILIGHT) self._check_event(utc_point_in_time, "dusk", PHASE_NAUTICAL_TWILIGHT)
self.location.solar_depression = "astronomical" self.location.solar_depression = "astronomical"
self._check_event(utc_point_in_time, "dusk", PHASE_ASTRONOMICAL_TWILIGHT) self._check_event(utc_point_in_time, "dusk", PHASE_ASTRONOMICAL_TWILIGHT)
self.next_midnight = self._check_event( self.next_midnight = self._check_event(utc_point_in_time, "midnight", None)
utc_point_in_time, "solar_midnight", None
)
self.location.solar_depression = "civil" self.location.solar_depression = "civil"
# if the event was solar midday or midnight, phase will now # if the event was solar midday or midnight, phase will now
@ -190,7 +190,7 @@ class Sun(Entity):
# even in the day at the poles, so we can't rely on it. # even in the day at the poles, so we can't rely on it.
# Need to calculate phase if next is noon or midnight # Need to calculate phase if next is noon or midnight
if self.phase is None: if self.phase is None:
elevation = self.location.solar_elevation(self._next_change) elevation = self.location.solar_elevation(self._next_change, self.elevation)
if elevation >= 10: if elevation >= 10:
self.phase = PHASE_DAY self.phase = PHASE_DAY
elif elevation >= 0: elif elevation >= 0:
@ -222,9 +222,11 @@ class Sun(Entity):
"""Calculate the position of the sun.""" """Calculate the position of the sun."""
# Grab current time in case system clock changed since last time we ran. # Grab current time in case system clock changed since last time we ran.
utc_point_in_time = dt_util.utcnow() utc_point_in_time = dt_util.utcnow()
self.solar_azimuth = round(self.location.solar_azimuth(utc_point_in_time), 2) self.solar_azimuth = round(
self.location.solar_azimuth(utc_point_in_time, self.elevation), 2
)
self.solar_elevation = round( self.solar_elevation = round(
self.location.solar_elevation(utc_point_in_time), 2 self.location.solar_elevation(utc_point_in_time, self.elevation), 2
) )
_LOGGER.debug( _LOGGER.debug(

14
homeassistant/components/tod/binary_sensor.py
View File

@ -173,20 +173,6 @@ class TodSensor(BinarySensorEntity):
self._time_before = before_event_date self._time_before = before_event_date
# We are calculating the _time_after value assuming that it will happen today
# But that is not always true, e.g. after 23:00, before 12:00 and now is 10:00
# If _time_before and _time_after are ahead of current_datetime:
# _time_before is set to 12:00 next day
# _time_after is set to 23:00 today
# current_datetime is set to 10:00 today
if (
self._time_after > self.current_datetime
and self._time_before > self.current_datetime + timedelta(days=1)
):
# remove one day from _time_before and _time_after
self._time_after -= timedelta(days=1)
self._time_before -= timedelta(days=1)
# Add offset to utc boundaries according to the configuration # Add offset to utc boundaries according to the configuration
self._time_after += self._after_offset self._time_after += self._after_offset
self._time_before += self._before_offset self._time_before += self._before_offset

45
homeassistant/helpers/sun.py
View File

@ -14,27 +14,32 @@ if TYPE_CHECKING:
DATA_LOCATION_CACHE = "astral_location_cache" DATA_LOCATION_CACHE = "astral_location_cache"
ELEVATION_AGNOSTIC_EVENTS = ("noon", "midnight")
@callback @callback
@bind_hass @bind_hass
def get_astral_location(hass: HomeAssistant) -> astral.Location: def get_astral_location(
hass: HomeAssistant,
) -> tuple[astral.location.Location, astral.Elevation]:
"""Get an astral location for the current Home Assistant configuration.""" """Get an astral location for the current Home Assistant configuration."""
from astral import Location # pylint: disable=import-outside-toplevel from astral import LocationInfo # pylint: disable=import-outside-toplevel
from astral.location import Location # pylint: disable=import-outside-toplevel
latitude = hass.config.latitude latitude = hass.config.latitude
longitude = hass.config.longitude longitude = hass.config.longitude
timezone = str(hass.config.time_zone) timezone = str(hass.config.time_zone)
elevation = hass.config.elevation elevation = hass.config.elevation
info = ("", "", latitude, longitude, timezone, elevation) info = ("", "", timezone, latitude, longitude)
# Cache astral locations so they aren't recreated with the same args # Cache astral locations so they aren't recreated with the same args
if DATA_LOCATION_CACHE not in hass.data: if DATA_LOCATION_CACHE not in hass.data:
hass.data[DATA_LOCATION_CACHE] = {} hass.data[DATA_LOCATION_CACHE] = {}
if info not in hass.data[DATA_LOCATION_CACHE]: if info not in hass.data[DATA_LOCATION_CACHE]:
hass.data[DATA_LOCATION_CACHE][info] = Location(info) hass.data[DATA_LOCATION_CACHE][info] = Location(LocationInfo(*info))
return hass.data[DATA_LOCATION_CACHE][info] return hass.data[DATA_LOCATION_CACHE][info], elevation
@callback @callback
@ -46,19 +51,21 @@ def get_astral_event_next(
offset: datetime.timedelta | None = None, offset: datetime.timedelta | None = None,
) -> datetime.datetime: ) -> datetime.datetime:
"""Calculate the next specified solar event.""" """Calculate the next specified solar event."""
location = get_astral_location(hass) location, elevation = get_astral_location(hass)
return get_location_astral_event_next(location, event, utc_point_in_time, offset) return get_location_astral_event_next(
location, elevation, event, utc_point_in_time, offset
)
@callback @callback
def get_location_astral_event_next( def get_location_astral_event_next(
location: astral.Location, location: astral.location.Location,
elevation: astral.Elevation,
event: str, event: str,
utc_point_in_time: datetime.datetime | None = None, utc_point_in_time: datetime.datetime | None = None,
offset: datetime.timedelta | None = None, offset: datetime.timedelta | None = None,
) -> datetime.datetime: ) -> datetime.datetime:
"""Calculate the next specified solar event.""" """Calculate the next specified solar event."""
from astral import AstralError # pylint: disable=import-outside-toplevel
if offset is None: if offset is None:
offset = datetime.timedelta() offset = datetime.timedelta()
@ -66,6 +73,10 @@ def get_location_astral_event_next(
if utc_point_in_time is None: if utc_point_in_time is None:
utc_point_in_time = dt_util.utcnow() utc_point_in_time = dt_util.utcnow()
kwargs = {"local": False}
if event not in ELEVATION_AGNOSTIC_EVENTS:
kwargs["observer_elevation"] = elevation
mod = -1 mod = -1
while True: while True:
try: try:
@ -73,13 +84,13 @@ def get_location_astral_event_next(
getattr(location, event)( getattr(location, event)(
dt_util.as_local(utc_point_in_time).date() dt_util.as_local(utc_point_in_time).date()
+ datetime.timedelta(days=mod), + datetime.timedelta(days=mod),
local=False, **kwargs,
) )
+ offset + offset
) )
if next_dt > utc_point_in_time: if next_dt > utc_point_in_time:
return next_dt return next_dt
except AstralError: except ValueError:
pass pass
mod += 1 mod += 1
@ -92,9 +103,7 @@ def get_astral_event_date(
date: datetime.date | datetime.datetime | None = None, date: datetime.date | datetime.datetime | None = None,
) -> datetime.datetime | None: ) -> datetime.datetime | None:
"""Calculate the astral event time for the specified date.""" """Calculate the astral event time for the specified date."""
from astral import AstralError # pylint: disable=import-outside-toplevel location, elevation = get_astral_location(hass)
location = get_astral_location(hass)
if date is None: if date is None:
date = dt_util.now().date() date = dt_util.now().date()
@ -102,9 +111,13 @@ def get_astral_event_date(
if isinstance(date, datetime.datetime): if isinstance(date, datetime.datetime):
date = dt_util.as_local(date).date() date = dt_util.as_local(date).date()
kwargs = {"local": False}
if event not in ELEVATION_AGNOSTIC_EVENTS:
kwargs["observer_elevation"] = elevation
try: try:
return getattr(location, event)(date, local=False) # type: ignore return getattr(location, event)(date, **kwargs) # type: ignore
except AstralError: except ValueError:
# Event never occurs for specified date. # Event never occurs for specified date.
return None return None

2
homeassistant/package_constraints.txt
View File

@ -3,7 +3,7 @@ PyNaCl==1.3.0
aiodiscover==1.3.2 aiodiscover==1.3.2
aiohttp==3.7.4.post0 aiohttp==3.7.4.post0
aiohttp_cors==0.7.0 aiohttp_cors==0.7.0
astral==1.10.1 astral==2.2
async-upnp-client==0.16.0 async-upnp-client==0.16.0
async_timeout==3.0.1 async_timeout==3.0.1
attrs==20.3.0 attrs==20.3.0

2
requirements.txt
View File

@ -2,7 +2,7 @@
# Home Assistant Core # Home Assistant Core
aiohttp==3.7.4.post0 aiohttp==3.7.4.post0
astral==1.10.1 astral==2.2
async_timeout==3.0.1 async_timeout==3.0.1
attrs==20.3.0 attrs==20.3.0
awesomeversion==21.2.3 awesomeversion==21.2.3

2
setup.py
View File

@ -33,7 +33,7 @@ PACKAGES = find_packages(exclude=["tests", "tests.*"])
REQUIRES = [ REQUIRES = [
"aiohttp==3.7.4.post0", "aiohttp==3.7.4.post0",
"astral==1.10.1", "astral==2.2",
"async_timeout==3.0.1", "async_timeout==3.0.1",
"attrs==20.3.0", "attrs==20.3.0",
"awesomeversion==21.2.3", "awesomeversion==21.2.3",

37
tests/components/sun/test_init.py
View File

@ -22,18 +22,19 @@ async def test_setting_rising(hass, legacy_patchable_time):
await hass.async_block_till_done() await hass.async_block_till_done()
state = hass.states.get(sun.ENTITY_ID) state = hass.states.get(sun.ENTITY_ID)
from astral import Astral from astral import LocationInfo
import astral.sun
astral = Astral()
utc_today = utc_now.date() utc_today = utc_now.date()
latitude = hass.config.latitude location = LocationInfo(
longitude = hass.config.longitude latitude=hass.config.latitude, longitude=hass.config.longitude
)
mod = -1 mod = -1
while True: while True:
next_dawn = astral.dawn_utc( next_dawn = astral.sun.dawn(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_dawn > utc_now: if next_dawn > utc_now:
break break
@ -41,8 +42,8 @@ async def test_setting_rising(hass, legacy_patchable_time):
mod = -1 mod = -1
while True: while True:
next_dusk = astral.dusk_utc( next_dusk = astral.sun.dusk(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_dusk > utc_now: if next_dusk > utc_now:
break break
@ -50,8 +51,8 @@ async def test_setting_rising(hass, legacy_patchable_time):
mod = -1 mod = -1
while True: while True:
next_midnight = astral.solar_midnight_utc( next_midnight = astral.sun.midnight(
utc_today + timedelta(days=mod), longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_midnight > utc_now: if next_midnight > utc_now:
break break
@ -59,15 +60,17 @@ async def test_setting_rising(hass, legacy_patchable_time):
mod = -1 mod = -1
while True: while True:
next_noon = astral.solar_noon_utc(utc_today + timedelta(days=mod), longitude) next_noon = astral.sun.noon(
location.observer, date=utc_today + timedelta(days=mod)
)
if next_noon > utc_now: if next_noon > utc_now:
break break
mod += 1 mod += 1
mod = -1 mod = -1
while True: while True:
next_rising = astral.sunrise_utc( next_rising = astral.sun.sunrise(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_rising > utc_now: if next_rising > utc_now:
break break
@ -75,8 +78,8 @@ async def test_setting_rising(hass, legacy_patchable_time):
mod = -1 mod = -1
while True: while True:
next_setting = astral.sunset_utc( next_setting = astral.sun.sunset(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_setting > utc_now: if next_setting > utc_now:
break break
@ -152,10 +155,10 @@ async def test_norway_in_june(hass):
assert dt_util.parse_datetime( assert dt_util.parse_datetime(
state.attributes[sun.STATE_ATTR_NEXT_RISING] state.attributes[sun.STATE_ATTR_NEXT_RISING]
) == datetime(2016, 7, 25, 23, 23, 39, tzinfo=dt_util.UTC) ) == datetime(2016, 7, 24, 22, 59, 45, 689645, tzinfo=dt_util.UTC)
assert dt_util.parse_datetime( assert dt_util.parse_datetime(
state.attributes[sun.STATE_ATTR_NEXT_SETTING] state.attributes[sun.STATE_ATTR_NEXT_SETTING]
) == datetime(2016, 7, 26, 22, 19, 1, tzinfo=dt_util.UTC) ) == datetime(2016, 7, 25, 22, 17, 13, 503932, tzinfo=dt_util.UTC)
assert state.state == sun.STATE_ABOVE_HORIZON assert state.state == sun.STATE_ABOVE_HORIZON

116
tests/components/sun/test_trigger.py
View File

@ -188,17 +188,17 @@ async def test_if_action_before_sunrise_no_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunrise + 1s -> 'before sunrise' not true # now = sunrise + 1s -> 'before sunrise' not true
now = datetime(2015, 9, 16, 13, 32, 44, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 19, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise -> 'before sunrise' true # now = sunrise -> 'before sunrise' true
now = datetime(2015, 9, 16, 13, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 18, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -237,17 +237,17 @@ async def test_if_action_after_sunrise_no_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunrise - 1s -> 'after sunrise' not true # now = sunrise - 1s -> 'after sunrise' not true
now = datetime(2015, 9, 16, 13, 32, 42, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 17, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise + 1s -> 'after sunrise' true # now = sunrise + 1s -> 'after sunrise' true
now = datetime(2015, 9, 16, 13, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 19, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -290,17 +290,17 @@ async def test_if_action_before_sunrise_with_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunrise + 1s + 1h -> 'before sunrise' with offset +1h not true # now = sunrise + 1s + 1h -> 'before sunrise' with offset +1h not true
now = datetime(2015, 9, 16, 14, 32, 44, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 14, 33, 19, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise + 1h -> 'before sunrise' with offset +1h true # now = sunrise + 1h -> 'before sunrise' with offset +1h true
now = datetime(2015, 9, 16, 14, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 14, 33, 18, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -335,14 +335,14 @@ async def test_if_action_before_sunrise_with_offset(hass, calls):
assert len(calls) == 2 assert len(calls) == 2
# now = sunset -> 'before sunrise' with offset +1h not true # now = sunset -> 'before sunrise' with offset +1h not true
now = datetime(2015, 9, 17, 1, 56, 48, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 45, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 2 assert len(calls) == 2
# now = sunset -1s -> 'before sunrise' with offset +1h not true # now = sunset -1s -> 'before sunrise' with offset +1h not true
now = datetime(2015, 9, 17, 1, 56, 45, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 44, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -371,8 +371,8 @@ async def test_if_action_before_sunset_with_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = local midnight -> 'before sunset' with offset +1h true # now = local midnight -> 'before sunset' with offset +1h true
now = datetime(2015, 9, 16, 7, 0, 0, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 7, 0, 0, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
@ -381,14 +381,14 @@ async def test_if_action_before_sunset_with_offset(hass, calls):
assert len(calls) == 1 assert len(calls) == 1
# now = sunset + 1s + 1h -> 'before sunset' with offset +1h not true # now = sunset + 1s + 1h -> 'before sunset' with offset +1h not true
now = datetime(2015, 9, 17, 2, 55, 25, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 2, 53, 46, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 1 assert len(calls) == 1
# now = sunset + 1h -> 'before sunset' with offset +1h true # now = sunset + 1h -> 'before sunset' with offset +1h true
now = datetime(2015, 9, 17, 2, 55, 24, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 2, 53, 44, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -409,14 +409,14 @@ async def test_if_action_before_sunset_with_offset(hass, calls):
assert len(calls) == 4 assert len(calls) == 4
# now = sunrise -> 'before sunset' with offset +1h true # now = sunrise -> 'before sunset' with offset +1h true
now = datetime(2015, 9, 16, 13, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 18, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 5 assert len(calls) == 5
# now = sunrise -1s -> 'before sunset' with offset +1h true # now = sunrise -1s -> 'before sunset' with offset +1h true
now = datetime(2015, 9, 16, 13, 32, 42, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 17, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -452,17 +452,17 @@ async def test_if_action_after_sunrise_with_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunrise - 1s + 1h -> 'after sunrise' with offset +1h not true # now = sunrise - 1s + 1h -> 'after sunrise' with offset +1h not true
now = datetime(2015, 9, 16, 14, 32, 42, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 14, 33, 17, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise + 1h -> 'after sunrise' with offset +1h true # now = sunrise + 1h -> 'after sunrise' with offset +1h true
now = datetime(2015, 9, 16, 14, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 14, 33, 58, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -497,14 +497,14 @@ async def test_if_action_after_sunrise_with_offset(hass, calls):
assert len(calls) == 3 assert len(calls) == 3
# now = sunset -> 'after sunrise' with offset +1h true # now = sunset -> 'after sunrise' with offset +1h true
now = datetime(2015, 9, 17, 1, 55, 24, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 45, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 4 assert len(calls) == 4
# now = sunset + 1s -> 'after sunrise' with offset +1h true # now = sunset + 1s -> 'after sunrise' with offset +1h true
now = datetime(2015, 9, 17, 1, 55, 25, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 45, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -547,17 +547,17 @@ async def test_if_action_after_sunset_with_offset(hass, calls):
}, },
) )
# sunrise: 2015-09-15 06:32:05 local, sunset: 2015-09-15 18:56:46 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-15 13:32:05 UTC, sunset: 2015-09-16 01:56:46 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunset - 1s + 1h -> 'after sunset' with offset +1h not true # now = sunset - 1s + 1h -> 'after sunset' with offset +1h not true
now = datetime(2015, 9, 16, 2, 56, 45, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 2, 53, 44, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunset + 1h -> 'after sunset' with offset +1h true # now = sunset + 1h -> 'after sunset' with offset +1h true
now = datetime(2015, 9, 16, 2, 56, 46, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 2, 53, 45, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -600,31 +600,31 @@ async def test_if_action_before_and_after_during(hass, calls):
}, },
) )
# sunrise: 2015-09-16 06:32:43 local, sunset: 2015-09-16 18:55:24 local # sunrise: 2015-09-16 06:33:18 local, sunset: 2015-09-16 18:53:45 local
# sunrise: 2015-09-16 13:32:43 UTC, sunset: 2015-09-17 01:55:24 UTC # sunrise: 2015-09-16 13:33:18 UTC, sunset: 2015-09-17 01:53:45 UTC
# now = sunrise - 1s -> 'after sunrise' + 'before sunset' not true # now = sunrise - 1s -> 'after sunrise' + 'before sunset' not true
now = datetime(2015, 9, 16, 13, 32, 42, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 17, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunset + 1s -> 'after sunrise' + 'before sunset' not true # now = sunset + 1s -> 'after sunrise' + 'before sunset' not true
now = datetime(2015, 9, 17, 1, 55, 25, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 46, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise -> 'after sunrise' + 'before sunset' true # now = sunrise + 1s -> 'after sunrise' + 'before sunset' true
now = datetime(2015, 9, 16, 13, 32, 43, tzinfo=dt_util.UTC) now = datetime(2015, 9, 16, 13, 33, 19, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 1 assert len(calls) == 1
# now = sunset -> 'after sunrise' + 'before sunset' true # now = sunset - 1s -> 'after sunrise' + 'before sunset' true
now = datetime(2015, 9, 17, 1, 55, 24, tzinfo=dt_util.UTC) now = datetime(2015, 9, 17, 1, 53, 44, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -663,17 +663,17 @@ async def test_if_action_before_sunrise_no_offset_kotzebue(hass, calls):
}, },
) )
# sunrise: 2015-07-24 07:17:24 local, sunset: 2015-07-25 03:16:27 local # sunrise: 2015-07-24 07:21:12 local, sunset: 2015-07-25 03:13:33 local
# sunrise: 2015-07-24 15:17:24 UTC, sunset: 2015-07-25 11:16:27 UTC # sunrise: 2015-07-24 15:21:12 UTC, sunset: 2015-07-25 11:13:33 UTC
# now = sunrise + 1s -> 'before sunrise' not true # now = sunrise + 1s -> 'before sunrise' not true
now = datetime(2015, 7, 24, 15, 17, 25, tzinfo=dt_util.UTC) now = datetime(2015, 7, 24, 15, 21, 13, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise -> 'before sunrise' true # now = sunrise - 1h -> 'before sunrise' true
now = datetime(2015, 7, 24, 15, 17, 24, tzinfo=dt_util.UTC) now = datetime(2015, 7, 24, 14, 21, 12, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -719,17 +719,17 @@ async def test_if_action_after_sunrise_no_offset_kotzebue(hass, calls):
}, },
) )
# sunrise: 2015-07-24 07:17:24 local, sunset: 2015-07-25 03:16:27 local # sunrise: 2015-07-24 07:21:12 local, sunset: 2015-07-25 03:13:33 local
# sunrise: 2015-07-24 15:17:24 UTC, sunset: 2015-07-25 11:16:27 UTC # sunrise: 2015-07-24 15:21:12 UTC, sunset: 2015-07-25 11:13:33 UTC
# now = sunrise -> 'after sunrise' true # now = sunrise -> 'after sunrise' true
now = datetime(2015, 7, 24, 15, 17, 24, tzinfo=dt_util.UTC) now = datetime(2015, 7, 24, 15, 21, 12, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 1 assert len(calls) == 1
# now = sunrise - 1s -> 'after sunrise' not true # now = sunrise - 1h -> 'after sunrise' not true
now = datetime(2015, 7, 24, 15, 17, 23, tzinfo=dt_util.UTC) now = datetime(2015, 7, 24, 14, 21, 12, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -775,17 +775,17 @@ async def test_if_action_before_sunset_no_offset_kotzebue(hass, calls):
}, },
) )
# sunrise: 2015-07-24 07:17:24 local, sunset: 2015-07-25 03:16:27 local # sunrise: 2015-07-24 07:21:12 local, sunset: 2015-07-25 03:13:33 local
# sunrise: 2015-07-24 15:17:24 UTC, sunset: 2015-07-25 11:16:27 UTC # sunrise: 2015-07-24 15:21:12 UTC, sunset: 2015-07-25 11:13:33 UTC
# now = sunrise + 1s -> 'before sunrise' not true # now = sunset + 1s -> 'before sunset' not true
now = datetime(2015, 7, 25, 11, 16, 28, tzinfo=dt_util.UTC) now = datetime(2015, 7, 25, 11, 13, 34, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 0 assert len(calls) == 0
# now = sunrise -> 'before sunrise' true # now = sunset - 1h-> 'before sunset' true
now = datetime(2015, 7, 25, 11, 16, 27, tzinfo=dt_util.UTC) now = datetime(2015, 7, 25, 10, 13, 33, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
@ -831,17 +831,17 @@ async def test_if_action_after_sunset_no_offset_kotzebue(hass, calls):
}, },
) )
# sunrise: 2015-07-24 07:17:24 local, sunset: 2015-07-25 03:16:27 local # sunrise: 2015-07-24 07:21:12 local, sunset: 2015-07-25 03:13:33 local
# sunrise: 2015-07-24 15:17:24 UTC, sunset: 2015-07-25 11:16:27 UTC # sunrise: 2015-07-24 15:21:12 UTC, sunset: 2015-07-25 11:13:33 UTC
# now = sunset -> 'after sunset' true # now = sunset -> 'after sunset' true
now = datetime(2015, 7, 25, 11, 16, 27, tzinfo=dt_util.UTC) now = datetime(2015, 7, 25, 11, 13, 33, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 1 assert len(calls) == 1
# now = sunset - 1s -> 'after sunset' not true # now = sunset - 1s -> 'after sunset' not true
now = datetime(2015, 7, 25, 11, 16, 26, tzinfo=dt_util.UTC) now = datetime(2015, 7, 25, 11, 13, 32, tzinfo=dt_util.UTC)
with patch("homeassistant.util.dt.utcnow", return_value=now): with patch("homeassistant.util.dt.utcnow", return_value=now):
hass.bus.async_fire("test_event") hass.bus.async_fire("test_event")
await hass.async_block_till_done() await hass.async_block_till_done()

3
tests/components/tod/test_binary_sensor.py
View File

@ -643,6 +643,7 @@ async def test_norwegian_case_summer(hass):
"""Test location in Norway where the sun doesn't set in summer.""" """Test location in Norway where the sun doesn't set in summer."""
hass.config.latitude = 69.6 hass.config.latitude = 69.6
hass.config.longitude = 18.8 hass.config.longitude = 18.8
hass.config.elevation = 10.0
test_time = hass.config.time_zone.localize(datetime(2010, 6, 1)).astimezone( test_time = hass.config.time_zone.localize(datetime(2010, 6, 1)).astimezone(
pytz.UTC pytz.UTC
@ -652,7 +653,7 @@ async def test_norwegian_case_summer(hass):
get_astral_event_next(hass, "sunrise", dt_util.as_utc(test_time)) get_astral_event_next(hass, "sunrise", dt_util.as_utc(test_time))
) )
sunset = dt_util.as_local( sunset = dt_util.as_local(
get_astral_event_next(hass, "sunset", dt_util.as_utc(test_time)) get_astral_event_next(hass, "sunset", dt_util.as_utc(sunrise))
) )
config = { config = {
"binary_sensor": [ "binary_sensor": [

37
tests/helpers/test_event.py
View File

@ -4,7 +4,8 @@ import asyncio
from datetime import datetime, timedelta from datetime import datetime, timedelta
from unittest.mock import patch from unittest.mock import patch
from astral import Astral from astral import LocationInfo
import astral.sun
import jinja2 import jinja2
import pytest import pytest
@ -2433,15 +2434,18 @@ async def test_track_sunrise(hass, legacy_patchable_time):
hass, sun.DOMAIN, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}} hass, sun.DOMAIN, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}
) )
location = LocationInfo(
latitude=hass.config.latitude, longitude=hass.config.longitude
)
# Get next sunrise/sunset # Get next sunrise/sunset
astral = Astral()
utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC)
utc_today = utc_now.date() utc_today = utc_now.date()
mod = -1 mod = -1
while True: while True:
next_rising = astral.sunrise_utc( next_rising = astral.sun.sunrise(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_rising > utc_now: if next_rising > utc_now:
break break
@ -2493,15 +2497,18 @@ async def test_track_sunrise_update_location(hass, legacy_patchable_time):
hass, sun.DOMAIN, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}} hass, sun.DOMAIN, {sun.DOMAIN: {sun.CONF_ELEVATION: 0}}
) )
location = LocationInfo(
latitude=hass.config.latitude, longitude=hass.config.longitude
)
# Get next sunrise # Get next sunrise
astral = Astral()
utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC)
utc_today = utc_now.date() utc_today = utc_now.date()
mod = -1 mod = -1
while True: while True:
next_rising = astral.sunrise_utc( next_rising = astral.sun.sunrise(
utc_today + timedelta(days=mod), hass.config.latitude, hass.config.longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_rising > utc_now: if next_rising > utc_now:
break break
@ -2522,6 +2529,11 @@ async def test_track_sunrise_update_location(hass, legacy_patchable_time):
await hass.config.async_update(latitude=40.755931, longitude=-73.984606) await hass.config.async_update(latitude=40.755931, longitude=-73.984606)
await hass.async_block_till_done() await hass.async_block_till_done()
# update location for astral
location = LocationInfo(
latitude=hass.config.latitude, longitude=hass.config.longitude
)
# Mimic sunrise # Mimic sunrise
async_fire_time_changed(hass, next_rising) async_fire_time_changed(hass, next_rising)
await hass.async_block_till_done() await hass.async_block_till_done()
@ -2531,8 +2543,8 @@ async def test_track_sunrise_update_location(hass, legacy_patchable_time):
# Get next sunrise # Get next sunrise
mod = -1 mod = -1
while True: while True:
next_rising = astral.sunrise_utc( next_rising = astral.sun.sunrise(
utc_today + timedelta(days=mod), hass.config.latitude, hass.config.longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_rising > utc_now: if next_rising > utc_now:
break break
@ -2549,6 +2561,8 @@ async def test_track_sunset(hass, legacy_patchable_time):
latitude = 32.87336 latitude = 32.87336
longitude = 117.22743 longitude = 117.22743
location = LocationInfo(latitude=latitude, longitude=longitude)
# Setup sun component # Setup sun component
hass.config.latitude = latitude hass.config.latitude = latitude
hass.config.longitude = longitude hass.config.longitude = longitude
@ -2557,14 +2571,13 @@ async def test_track_sunset(hass, legacy_patchable_time):
) )
# Get next sunrise/sunset # Get next sunrise/sunset
astral = Astral()
utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2014, 5, 24, 12, 0, 0, tzinfo=dt_util.UTC)
utc_today = utc_now.date() utc_today = utc_now.date()
mod = -1 mod = -1
while True: while True:
next_setting = astral.sunset_utc( next_setting = astral.sun.sunset(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_setting > utc_now: if next_setting > utc_now:
break break

116
tests/helpers/test_sun.py
View File

@ -11,18 +11,19 @@ import homeassistant.util.dt as dt_util
def test_next_events(hass): def test_next_events(hass):
"""Test retrieving next sun events.""" """Test retrieving next sun events."""
utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC)
from astral import Astral from astral import LocationInfo
import astral.sun
astral = Astral()
utc_today = utc_now.date() utc_today = utc_now.date()
latitude = hass.config.latitude location = LocationInfo(
longitude = hass.config.longitude latitude=hass.config.latitude, longitude=hass.config.longitude
)
mod = -1 mod = -1
while True: while True:
next_dawn = astral.dawn_utc( next_dawn = astral.sun.dawn(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_dawn > utc_now: if next_dawn > utc_now:
break break
@ -30,8 +31,8 @@ def test_next_events(hass):
mod = -1 mod = -1
while True: while True:
next_dusk = astral.dusk_utc( next_dusk = astral.sun.dusk(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_dusk > utc_now: if next_dusk > utc_now:
break break
@ -39,8 +40,8 @@ def test_next_events(hass):
mod = -1 mod = -1
while True: while True:
next_midnight = astral.solar_midnight_utc( next_midnight = astral.sun.midnight(
utc_today + timedelta(days=mod), longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_midnight > utc_now: if next_midnight > utc_now:
break break
@ -48,15 +49,17 @@ def test_next_events(hass):
mod = -1 mod = -1
while True: while True:
next_noon = astral.solar_noon_utc(utc_today + timedelta(days=mod), longitude) next_noon = astral.sun.noon(
location.observer, date=utc_today + timedelta(days=mod)
)
if next_noon > utc_now: if next_noon > utc_now:
break break
mod += 1 mod += 1
mod = -1 mod = -1
while True: while True:
next_rising = astral.sunrise_utc( next_rising = astral.sun.sunrise(
utc_today + timedelta(days=mod), latitude, longitude location.observer, date=utc_today + timedelta(days=mod)
) )
if next_rising > utc_now: if next_rising > utc_now:
break break
@ -64,8 +67,8 @@ def test_next_events(hass):
mod = -1 mod = -1
while True: while True:
next_setting = astral.sunset_utc( next_setting = astral.sun.sunset(
utc_today + timedelta(days=mod), latitude, longitude location.observer, utc_today + timedelta(days=mod)
) )
if next_setting > utc_now: if next_setting > utc_now:
break break
@ -74,8 +77,8 @@ def test_next_events(hass):
with patch("homeassistant.helpers.condition.dt_util.utcnow", return_value=utc_now): with patch("homeassistant.helpers.condition.dt_util.utcnow", return_value=utc_now):
assert next_dawn == sun.get_astral_event_next(hass, "dawn") assert next_dawn == sun.get_astral_event_next(hass, "dawn")
assert next_dusk == sun.get_astral_event_next(hass, "dusk") assert next_dusk == sun.get_astral_event_next(hass, "dusk")
assert next_midnight == sun.get_astral_event_next(hass, "solar_midnight") assert next_midnight == sun.get_astral_event_next(hass, "midnight")
assert next_noon == sun.get_astral_event_next(hass, "solar_noon") assert next_noon == sun.get_astral_event_next(hass, "noon")
assert next_rising == sun.get_astral_event_next(hass, SUN_EVENT_SUNRISE) assert next_rising == sun.get_astral_event_next(hass, SUN_EVENT_SUNRISE)
assert next_setting == sun.get_astral_event_next(hass, SUN_EVENT_SUNSET) assert next_setting == sun.get_astral_event_next(hass, SUN_EVENT_SUNSET)
@ -83,25 +86,26 @@ def test_next_events(hass):
def test_date_events(hass): def test_date_events(hass):
"""Test retrieving next sun events.""" """Test retrieving next sun events."""
utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC)
from astral import Astral from astral import LocationInfo
import astral.sun
astral = Astral()
utc_today = utc_now.date() utc_today = utc_now.date()
latitude = hass.config.latitude location = LocationInfo(
longitude = hass.config.longitude latitude=hass.config.latitude, longitude=hass.config.longitude
)
dawn = astral.dawn_utc(utc_today, latitude, longitude) dawn = astral.sun.dawn(location.observer, utc_today)
dusk = astral.dusk_utc(utc_today, latitude, longitude) dusk = astral.sun.dusk(location.observer, utc_today)
midnight = astral.solar_midnight_utc(utc_today, longitude) midnight = astral.sun.midnight(location.observer, utc_today)
noon = astral.solar_noon_utc(utc_today, longitude) noon = astral.sun.noon(location.observer, utc_today)
sunrise = astral.sunrise_utc(utc_today, latitude, longitude) sunrise = astral.sun.sunrise(location.observer, utc_today)
sunset = astral.sunset_utc(utc_today, latitude, longitude) sunset = astral.sun.sunset(location.observer, utc_today)
assert dawn == sun.get_astral_event_date(hass, "dawn", utc_today) assert dawn == sun.get_astral_event_date(hass, "dawn", utc_today)
assert dusk == sun.get_astral_event_date(hass, "dusk", utc_today) assert dusk == sun.get_astral_event_date(hass, "dusk", utc_today)
assert midnight == sun.get_astral_event_date(hass, "solar_midnight", utc_today) assert midnight == sun.get_astral_event_date(hass, "midnight", utc_today)
assert noon == sun.get_astral_event_date(hass, "solar_noon", utc_today) assert noon == sun.get_astral_event_date(hass, "noon", utc_today)
assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_today) assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_today)
assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_today) assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_today)
@ -109,26 +113,27 @@ def test_date_events(hass):
def test_date_events_default_date(hass): def test_date_events_default_date(hass):
"""Test retrieving next sun events.""" """Test retrieving next sun events."""
utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC)
from astral import Astral from astral import LocationInfo
import astral.sun
astral = Astral()
utc_today = utc_now.date() utc_today = utc_now.date()
latitude = hass.config.latitude location = LocationInfo(
longitude = hass.config.longitude latitude=hass.config.latitude, longitude=hass.config.longitude
)
dawn = astral.dawn_utc(utc_today, latitude, longitude) dawn = astral.sun.dawn(location.observer, date=utc_today)
dusk = astral.dusk_utc(utc_today, latitude, longitude) dusk = astral.sun.dusk(location.observer, date=utc_today)
midnight = astral.solar_midnight_utc(utc_today, longitude) midnight = astral.sun.midnight(location.observer, date=utc_today)
noon = astral.solar_noon_utc(utc_today, longitude) noon = astral.sun.noon(location.observer, date=utc_today)
sunrise = astral.sunrise_utc(utc_today, latitude, longitude) sunrise = astral.sun.sunrise(location.observer, date=utc_today)
sunset = astral.sunset_utc(utc_today, latitude, longitude) sunset = astral.sun.sunset(location.observer, date=utc_today)
with patch("homeassistant.util.dt.now", return_value=utc_now): with patch("homeassistant.util.dt.now", return_value=utc_now):
assert dawn == sun.get_astral_event_date(hass, "dawn", utc_today) assert dawn == sun.get_astral_event_date(hass, "dawn", utc_today)
assert dusk == sun.get_astral_event_date(hass, "dusk", utc_today) assert dusk == sun.get_astral_event_date(hass, "dusk", utc_today)
assert midnight == sun.get_astral_event_date(hass, "solar_midnight", utc_today) assert midnight == sun.get_astral_event_date(hass, "midnight", utc_today)
assert noon == sun.get_astral_event_date(hass, "solar_noon", utc_today) assert noon == sun.get_astral_event_date(hass, "noon", utc_today)
assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_today) assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_today)
assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_today) assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_today)
@ -136,25 +141,26 @@ def test_date_events_default_date(hass):
def test_date_events_accepts_datetime(hass): def test_date_events_accepts_datetime(hass):
"""Test retrieving next sun events.""" """Test retrieving next sun events."""
utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC) utc_now = datetime(2016, 11, 1, 8, 0, 0, tzinfo=dt_util.UTC)
from astral import Astral from astral import LocationInfo
import astral.sun
astral = Astral()
utc_today = utc_now.date() utc_today = utc_now.date()
latitude = hass.config.latitude location = LocationInfo(
longitude = hass.config.longitude latitude=hass.config.latitude, longitude=hass.config.longitude
)
dawn = astral.dawn_utc(utc_today, latitude, longitude) dawn = astral.sun.dawn(location.observer, date=utc_today)
dusk = astral.dusk_utc(utc_today, latitude, longitude) dusk = astral.sun.dusk(location.observer, date=utc_today)
midnight = astral.solar_midnight_utc(utc_today, longitude) midnight = astral.sun.midnight(location.observer, date=utc_today)
noon = astral.solar_noon_utc(utc_today, longitude) noon = astral.sun.noon(location.observer, date=utc_today)
sunrise = astral.sunrise_utc(utc_today, latitude, longitude) sunrise = astral.sun.sunrise(location.observer, date=utc_today)
sunset = astral.sunset_utc(utc_today, latitude, longitude) sunset = astral.sun.sunset(location.observer, date=utc_today)
assert dawn == sun.get_astral_event_date(hass, "dawn", utc_now) assert dawn == sun.get_astral_event_date(hass, "dawn", utc_now)
assert dusk == sun.get_astral_event_date(hass, "dusk", utc_now) assert dusk == sun.get_astral_event_date(hass, "dusk", utc_now)
assert midnight == sun.get_astral_event_date(hass, "solar_midnight", utc_now) assert midnight == sun.get_astral_event_date(hass, "midnight", utc_now)
assert noon == sun.get_astral_event_date(hass, "solar_noon", utc_now) assert noon == sun.get_astral_event_date(hass, "noon", utc_now)
assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_now) assert sunrise == sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, utc_now)
assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_now) assert sunset == sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, utc_now)
@ -184,10 +190,10 @@ def test_norway_in_june(hass):
print(sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, datetime(2017, 7, 26))) print(sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, datetime(2017, 7, 26)))
assert sun.get_astral_event_next(hass, SUN_EVENT_SUNRISE, june) == datetime( assert sun.get_astral_event_next(hass, SUN_EVENT_SUNRISE, june) == datetime(
2016, 7, 25, 23, 23, 39, tzinfo=dt_util.UTC 2016, 7, 24, 22, 59, 45, 689645, tzinfo=dt_util.UTC
) )
assert sun.get_astral_event_next(hass, SUN_EVENT_SUNSET, june) == datetime( assert sun.get_astral_event_next(hass, SUN_EVENT_SUNSET, june) == datetime(
2016, 7, 26, 22, 19, 1, tzinfo=dt_util.UTC 2016, 7, 25, 22, 17, 13, 503932, tzinfo=dt_util.UTC
) )
assert sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, june) is None assert sun.get_astral_event_date(hass, SUN_EVENT_SUNRISE, june) is None
assert sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, june) is None assert sun.get_astral_event_date(hass, SUN_EVENT_SUNSET, june) is None