Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
magnuselden authored and magnuselden committed Aug 17, 2023
2 parents bcc3775 + a008acd commit c6076a1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

from custom_components.peaqev.peaqservice.hub.observer.iobserver_coordinator import \
IObserver
from custom_components.peaqev.peaqservice.hub.observer.models.command import Command
from custom_components.peaqev.peaqservice.hub.observer.models.command import \
Command
from custom_components.peaqev.peaqservice.util.extensionmethods import \
async_iscoroutine

Expand Down
15 changes: 3 additions & 12 deletions custom_components/peaqev/sensors/money_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,12 @@

from homeassistant.helpers.restore_state import RestoreEntity

from custom_components.peaqev.peaqservice.hub.const import (
AVERAGE_KWH_PRICE, AVERAGE_MONTHLY, AVERAGE_NORDPOOL_DATA, CURRENCY,
CURRENT_PEAK, FUTURE_HOURS, MAX_CHARGE, MAX_PRICE, MIN_PRICE, USE_CENT)
from custom_components.peaqev.peaqservice.util.constants import HOURCONTROLLER
from custom_components.peaqev.sensors.money_sensor_helpers import *
from custom_components.peaqev.sensors.sensorbase import SensorBase
from custom_components.peaqev.peaqservice.hub.const import (
CURRENCY,
AVERAGE_NORDPOOL_DATA,
USE_CENT,
CURRENT_PEAK,
AVERAGE_KWH_PRICE,
MAX_CHARGE,
MAX_PRICE,
MIN_PRICE,
FUTURE_HOURS,
AVERAGE_MONTHLY
)

_LOGGER = logging.getLogger(__name__)

Expand Down
3 changes: 2 additions & 1 deletion custom_components/peaqev/test/test_gain_loss.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
from peaqevcore.models.locale.enums.time_periods import TimePeriods

from custom_components.peaqev.peaqservice.powertools.gainloss.const import *
from custom_components.peaqev.test.mock_classes.gain_loss_test import GainLossTest
from custom_components.peaqev.test.mock_classes.gain_loss_test import \
GainLossTest


@pytest.mark.asyncio
Expand Down
3 changes: 2 additions & 1 deletion custom_components/peaqev/test/test_observer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import pytest

from custom_components.peaqev.test.mock_classes.observer_coordinator_test import ObserverTest
from custom_components.peaqev.test.mock_classes.observer_coordinator_test import \
ObserverTest


class MockCalls:
Expand Down

0 comments on commit c6076a1

Please sign in to comment.