Skip to content

Generate fixtures #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 3, 2023
Merged

Generate fixtures #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad0db17
Ensure fixture write properly + generate manual fixtures
CoMPaTech May 1, 2023
effa332
black
CoMPaTech May 2, 2023
c9d411b
Add missing part of fixtures
CoMPaTech May 2, 2023
3b7529b
fixup: fake_fixtures Python code reformatted using Black
May 2, 2023
70f384e
Ensure black on scripts
CoMPaTech May 2, 2023
78b1041
Add back missing SmileSensor
bouwew May 2, 2023
956aa7e
Change domestic_hot_water_setpoint name,
bouwew May 3, 2023
0559cdc
Add new actuator-name to ACTIVE_ACTUATORS
bouwew May 3, 2023
5940206
Remove max_boiler_temp as sensor, always a number in Core
bouwew May 2, 2023
4322dbb
Bump to v0.31.3 release-version, update CHANGELOG
bouwew May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repos:
args:
- --safe
- --quiet
files: ^((plugwise|tests)/.+)?[^/]+\.py$
files: ^((plugwise|tests|scripts)/.+)?[^/]+\.py$
# Moved codespell configuration to setup.cfg as per 'all-files' issues not reading args
- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

## v0.31.3: Typing updates, improved fixture generation and manual mode-changes

## v0.31.2: Introduce strict-typing (py.typed)

## v0.31.1: Legacy Anna - read and process system-xml data
Expand Down
5 changes: 3 additions & 2 deletions plugwise/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
)
ACTIVE_ACTUATORS: Final[tuple[str, ...]] = (
"domestic_hot_water_setpoint",
"max_dhw_temperature",
"maximum_boiler_temperature",
"thermostat",
)
Expand Down Expand Up @@ -299,7 +300,6 @@
"humidity",
"illuminance",
"intended_boiler_temperature",
"maximum_boiler_temperature",
"modulation_level",
"net_electricity_cumulative",
"net_electricity_point",
Expand Down Expand Up @@ -383,6 +383,7 @@ class SmileSensors(TypedDict, total=False):
cooling_activation_outdoor_temperature: float
cooling_deactivation_threshold: float
dhw_temperature: float
domestic_hot_water_setpoint: float
temperature: float
electricity_consumed: float
electricity_consumed_interval: float
Expand Down Expand Up @@ -500,7 +501,7 @@ class DeviceData(
available: bool | None

binary_sensors: SmileBinarySensors
domestic_hot_water_setpoint: ActuatorData | float
max_dhw_temperature: ActuatorData | float
maximum_boiler_temperature: ActuatorData | float
sensors: SmileSensors
switches: SmileSwitches
Expand Down
6 changes: 6 additions & 0 deletions plugwise/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ def _get_actuator_functionalities(xml: etree, data: DeviceData) -> None:
temp_dict[key] = format_measure(function.text, TEMP_CELSIUS) # type: ignore [literal-required]

if temp_dict:
if item == "domestic_hot_water_setpoint":
item = "max_dhw_temperature"
# If max_dhw_temperature is present, don't show domestic_hot_water_setpoint sensor
if "domestic_hot_water_setpoint" in data:
data.pop("domestic_hot_water_setpoint")

data[item] = temp_dict # type: ignore [literal-required]


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "plugwise"
version = "0.31.2"
version = "0.31.3"
license = {file = "LICENSE"}
description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
readme = "README.md"
Expand Down
Loading