Skip to content

Commit

Permalink
Merge branch 'release/v7.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jabesq
jabesq committed Oct 3, 2022
2 parents 4a8c7ae + 8233cac commit afbcc01
Show file tree
Hide file tree
Showing 17 changed files with 694 additions and 762 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile.dev
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG VARIANT="3.8"
ARG VARIANT="3.10"

FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} as builder

Expand All @@ -11,8 +11,8 @@ COPY Pipfile Pipfile.lock ./
# Create Python requirements files from pipenv (lockfile)
RUN pip3 install -U pip \
&& pip3 install pipenv \
&& pipenv lock --requirements > /tmp/requirements.txt \
&& pipenv lock --dev --requirements > /tmp/requirements_dev.txt
&& pipenv requirements > /tmp/requirements.txt \
&& pipenv requirements --dev > /tmp/requirements_dev.txt

FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v3
uses: actions/setup-python@v4.2.0
with:
python-version: 3.8
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-test-pypi.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
ref: development
fetch-depth: 0
- name: Set up Python 3.8
uses: actions/setup-python@v3
uses: actions/setup-python@v4.2.0
with:
python-version: 3.8
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pythonpackage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -44,7 +44,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}
- name: Run tests with tox
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ ci:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.32.1
rev: v2.38.2
hooks:
- id: pyupgrade
args: [--py38-plus]
exclude: "external_src/int-tools"

- repo: https://github.com/asottile/add-trailing-comma
rev: v2.2.3
rev: v2.3.0
hooks:
- id: add-trailing-comma
args: [--py36-plus]
exclude: "external_src/int-tools"

- repo: https://github.com/asottile/yesqa
rev: v1.3.0
rev: v1.4.0
hooks:
- id: yesqa

- repo: https://github.com/psf/black
rev: 22.3.0
rev: 22.8.0
hooks:
- id: black
language_version: python3
Expand All @@ -38,7 +38,7 @@ repos:
name: isort (python)

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.960
rev: v0.981
hooks:
- id: mypy
name: mypy
Expand All @@ -47,7 +47,7 @@ repos:
- types-requests

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0 # Use the ref you want to point at
rev: v4.3.0 # Use the ref you want to point at
hooks:
- id: check-ast
- id: no-commit-to-branch
Expand All @@ -63,14 +63,14 @@ repos:
- id: check-toml

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1 # pick a git hash / tag to point to
rev: 5.0.4 # pick a git hash / tag to point to
hooks:
- id: flake8
exclude: (otp)
additional_dependencies: [flake8-typing-imports==1.11.0]

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v1.20.1
rev: v2.0.0
hooks:
- id: setup-cfg-fmt

Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [7.1.0] - 2022-10-03

### Added

- Adds Legrand NLIS double switches
- Adds Legrand NLPT relay/teleruptor

### Fixed

- Use dimmer type for Legrand NLF dimmers

## [7.0.1] - 2022-06-05

### Deprecated
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ twine = "*"
[packages]
requests = "*"
requests-oauthlib = "*"
aiohttp = ">=3.7.4"
aiohttp = ">3.8.1"

[pipenv]
allow_prereleases = true
1,025 changes: 536 additions & 489 deletions Pipfile.lock
View file

Large diffs are not rendered by default.

189 changes: 22 additions & 167 deletions fixtures/homesdata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@
"module_ids": [
"10:20:30:bd:b8:1e"
]
},
{
"id": "100007520",
"name": "Toilettes",
"type": "toilets",
"module_ids": [
"00:11:22:33:00:11:45:fe"
]
}
],
"modules": [
Expand Down Expand Up @@ -326,7 +334,8 @@
"modules_bridged": [
"12:34:56:80:00:12:ac:f2",
"12:34:56:80:00:c3:69:3c",
"12:34:56:00:00:a1:4c:da"
"12:34:56:00:00:a1:4c:da",
"00:11:22:33:00:11:45:fe"
]
},
{
Expand Down Expand Up @@ -463,9 +472,20 @@
"name": "Smarther",
"setup_date": 1638022197,
"room_id": "1002003001"
},
{
"id": "00:11:22:33:00:11:45:fe",
"type": "NLF",
"on": false,
"brightness": 63,
"firmware_revision": 57,
"last_seen": 1657086939,
"power": 0,
"reachable": true,
"bridge": "12:34:56:80:60:40"
}
],
"therm_schedules": [
"schedules": [
{
"zones": [
{
Expand Down Expand Up @@ -917,171 +937,6 @@
"url": "https://netatmocameraimage.blob.core.windows.net/production/d74fad765b9100ef480720a9a4a95c2d1730fb69ecdf2bb8b72039d2c69928b029d67fc40cb2d74b808a89f8"
}
],
"schedules": [
{
"zones": [
{
"type": 0,
"name": "Komfort",
"rooms_temp": [
{
"temp": 21,
"room_id": "2746182631"
}
],
"id": 0,
"rooms": [
{
"id": "2746182631",
"therm_setpoint_temperature": 21
}
]
},
{
"type": 1,
"name": "Nacht",
"rooms_temp": [
{
"temp": 17,
"room_id": "2746182631"
}
],
"id": 1,
"rooms": [
{
"id": "2746182631",
"therm_setpoint_temperature": 17
}
]
},
{
"type": 5,
"name": "Eco",
"rooms_temp": [
{
"temp": 17,
"room_id": "2746182631"
}
],
"id": 4,
"rooms": [
{
"id": "2746182631",
"therm_setpoint_temperature": 17
}
]
}
],
"timetable": [
{
"zone_id": 1,
"m_offset": 0
},
{
"zone_id": 0,
"m_offset": 360
},
{
"zone_id": 4,
"m_offset": 420
},
{
"zone_id": 0,
"m_offset": 960
},
{
"zone_id": 1,
"m_offset": 1410
},
{
"zone_id": 0,
"m_offset": 1800
},
{
"zone_id": 4,
"m_offset": 1860
},
{
"zone_id": 0,
"m_offset": 2400
},
{
"zone_id": 1,
"m_offset": 2850
},
{
"zone_id": 0,
"m_offset": 3240
},
{
"zone_id": 4,
"m_offset": 3300
},
{
"zone_id": 0,
"m_offset": 3840
},
{
"zone_id": 1,
"m_offset": 4290
},
{
"zone_id": 0,
"m_offset": 4680
},
{
"zone_id": 4,
"m_offset": 4740
},
{
"zone_id": 0,
"m_offset": 5280
},
{
"zone_id": 1,
"m_offset": 5730
},
{
"zone_id": 0,
"m_offset": 6120
},
{
"zone_id": 4,
"m_offset": 6180
},
{
"zone_id": 0,
"m_offset": 6720
},
{
"zone_id": 1,
"m_offset": 7170
},
{
"zone_id": 0,
"m_offset": 7620
},
{
"zone_id": 1,
"m_offset": 8610
},
{
"zone_id": 0,
"m_offset": 9060
},
{
"zone_id": 1,
"m_offset": 10050
}
],
"hg_temp": 7,
"away_temp": 14,
"name": "Default",
"id": "591b54a2764ff4d50d8b5795",
"selected": true,
"type": "therm"
}
],
"therm_mode": "schedule"
},
{
Expand Down
11 changes: 11 additions & 0 deletions fixtures/homestatus_91763b24c43d3e344f424e8b.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,17 @@
"boiler_valve_comfort_boost": false,
"boiler_status": true,
"cooler_status": false
},
{
"id": "00:11:22:33:00:11:45:fe",
"type": "NLF",
"on": false,
"brightness": 63,
"firmware_revision": 57,
"last_seen": 1657086939,
"power": 0,
"reachable": true,
"bridge": "12:34:56:80:60:40"
}
],
"rooms": [
Expand Down
Loading

0 comments on commit afbcc01

Please sign in to comment.