Skip to content

Commit 26edf50

Browse files
humbertogontijohumbertogontijo
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # roborock/api.py
2 parents 0a0c9e7 + e0aafd7 commit 26edf50

20 files changed

+542
-503
lines changed

‎.github/workflows/ci.yml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
name: CI
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
88

99
concurrency:
10-
group: ${{ github.head_ref || github.run_id }}
11-
cancel-in-progress: true
10+
group: ${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
1212

1313
jobs:
14-
# Make sure commit messages follow the conventional commits convention:
15-
# https://www.conventionalcommits.org
16-
commitlint:
17-
name: Lint Commit Messages
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: actions/checkout@v3
21-
with:
22-
fetch-depth: 0
23-
- uses: wagoid/[email protected]
24-
lint:
25-
runs-on: ubuntu-latest
26-
steps:
27-
- uses: actions/checkout@v3
28-
- uses: actions/setup-python@v4
29-
with:
30-
python-version: "3.10"
31-
- uses: pre-commit/[email protected]
14+
# Make sure commit messages follow the conventional commits convention:
15+
# https://www.conventionalcommits.org
16+
commitlint:
17+
name: Lint Commit Messages
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
fetch-depth: 0
23+
- uses: wagoid/[email protected]
24+
lint:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v3
28+
- uses: actions/setup-python@v4
29+
with:
30+
python-version: "3.10"
31+
- uses: pre-commit/[email protected]
3232

33-
test:
34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
python-version:
38-
- "3.10"
39-
- "3.11"
40-
os:
41-
- ubuntu-latest
42-
- windows-latest
43-
- macOS-latest
44-
runs-on: ${{ matrix.os }}
45-
steps:
46-
- uses: actions/checkout@v3
47-
- name: Set up Python
48-
uses: actions/setup-python@v4
49-
with:
50-
python-version: ${{ matrix.python-version }}
51-
- uses: snok/[email protected]
52-
- name: Install Dependencies
53-
run: poetry install
54-
shell: bash
55-
- name: Test with Pytest
56-
run: poetry run pytest
57-
shell: bash
58-
release:
59-
runs-on: ubuntu-latest
60-
environment: release
61-
if: github.ref == 'refs/heads/main'
62-
needs:
63-
- test
33+
test:
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
python-version:
38+
- "3.10"
39+
- "3.11"
40+
os:
41+
- ubuntu-latest
42+
- windows-latest
43+
- macOS-latest
44+
runs-on: ${{ matrix.os }}
45+
steps:
46+
- uses: actions/checkout@v3
47+
- name: Set up Python
48+
uses: actions/setup-python@v4
49+
with:
50+
python-version: ${{ matrix.python-version }}
51+
- uses: snok/[email protected]
52+
- name: Install Dependencies
53+
run: poetry install
54+
shell: bash
55+
- name: Test with Pytest
56+
run: poetry run pytest
57+
shell: bash
58+
release:
59+
runs-on: ubuntu-latest
60+
environment: release
61+
if: github.ref == 'refs/heads/main'
62+
needs:
63+
- test
6464

65-
steps:
66-
- uses: actions/checkout@v3
67-
with:
68-
fetch-depth: 0
69-
persist-credentials: false
65+
steps:
66+
- uses: actions/checkout@v3
67+
with:
68+
fetch-depth: 0
69+
persist-credentials: false
7070

71-
# Run semantic release:
72-
# - Update CHANGELOG.md
73-
# - Update version in code
74-
# - Create git tag
75-
# - Create GitHub release
76-
# - Publish to PyPI
77-
- name: Python Semantic Release
78-
uses: relekang/[email protected]
79-
with:
80-
github_token: ${{ secrets.GH_TOKEN }}
81-
repository_username: __token__
82-
repository_password: ${{ secrets.PYPI_TOKEN }}
71+
# Run semantic release:
72+
# - Update CHANGELOG.md
73+
# - Update version in code
74+
# - Create git tag
75+
# - Create GitHub release
76+
# - Publish to PyPI
77+
- name: Python Semantic Release
78+
uses: relekang/[email protected]
79+
with:
80+
github_token: ${{ secrets.GH_TOKEN }}
81+
repository_username: __token__
82+
repository_password: ${{ secrets.PYPI_TOKEN }}

‎.pre-commit-config.yaml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,44 @@
11
# See https://pre-commit.com for more information
22
# See https://pre-commit.com/hooks.html for more hooks
3+
exclude: "CHANGELOG.md"
34
default_stages: [ commit ]
45

5-
66
repos:
7+
- repo: https://github.com/pre-commit/pre-commit-hooks
8+
rev: v4.4.0
9+
hooks:
10+
- id: debug-statements
11+
- id: check-builtin-literals
12+
- id: check-case-conflict
13+
- id: check-docstring-first
14+
- id: check-json
15+
- id: check-toml
16+
- id: check-yaml
17+
- id: detect-private-key
18+
- id: end-of-file-fixer
19+
- id: trailing-whitespace
720
- repo: https://github.com/python-poetry/poetry
821
rev: 1.3.2
922
hooks:
1023
- id: poetry-check
24+
- repo: https://github.com/PyCQA/isort
25+
rev: 5.12.0
26+
hooks:
27+
- id: isort
28+
- repo: https://github.com/psf/black
29+
rev: 22.12.0
30+
hooks:
31+
- id: black
32+
- repo: https://github.com/codespell-project/codespell
33+
rev: v2.2.2
34+
hooks:
35+
- id: codespell
36+
- repo: https://github.com/charliermarsh/ruff-pre-commit
37+
rev: v0.0.260
38+
hooks:
39+
- id: ruff
40+
args:
41+
- --fix
1142
- repo: https://github.com/pre-commit/mirrors-mypy
1243
rev: v0.931
1344
hooks:

‎CHANGELOG.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,35 @@
22

33
<!--next-version-placeholder-->
44

5+
## v0.6.5 (2023-04-13)
6+
### Fix
7+
* Exclude changelog.md from pre-commit ([#36](https://github.com/humbertogontijo/python-roborock/issues/36)) ([`b12c7a2`](https://github.com/humbertogontijo/python-roborock/commit/b12c7a229dfdbe0af182d6a120548100b0ca4140))
8+
59
## v0.6.4 (2023-04-11)
10+
611
### Fix
7-
* Disconnect on timeout so next command can work ([`5ad397b`](https://github.com/humbertogontijo/python-roborock/commit/5ad397b3bbb4bc600888baba6c0cc15be9d17ef7))
12+
13+
- Disconnect on timeout so next command can work ([`5ad397b`](https://github.com/humbertogontijo/python-roborock/commit/5ad397b3bbb4bc600888baba6c0cc15be9d17ef7))
814

915
## v0.6.3 (2023-04-11)
16+
1017
### Fix
11-
* Semantic_release ([`63b249d`](https://github.com/humbertogontijo/python-roborock/commit/63b249d65d3fc40b048320e6596aedc40f588bf9))
18+
19+
- Semantic_release ([`63b249d`](https://github.com/humbertogontijo/python-roborock/commit/63b249d65d3fc40b048320e6596aedc40f588bf9))
1220

1321
## v0.6.2 (2023-04-11)
22+
1423
### Fix
15-
* Error code nogo_zone_detected ([`722e4b5`](https://github.com/humbertogontijo/python-roborock/commit/722e4b5cfd0c4891adc506e9fe99740860027670))
24+
25+
- Error code nogo_zone_detected ([`722e4b5`](https://github.com/humbertogontijo/python-roborock/commit/722e4b5cfd0c4891adc506e9fe99740860027670))
1626

1727
## v0.6.1 (2023-04-10)
28+
1829
### Fix
19-
* Trigger release ([`f1ce0ed`](https://github.com/humbertogontijo/python-roborock/commit/f1ce0ed55a254bccd8567b48974ff74dd9ec8b25))
20-
* Trigger release ([`9a4462c`](https://github.com/humbertogontijo/python-roborock/commit/9a4462c800762393cc047085156acbe119cd0fe4))
21-
* Trigger release ([`b7a664b`](https://github.com/humbertogontijo/python-roborock/commit/b7a664b15b7c5180d816de325537693f47c24860))
22-
* Trigger release ([`9256849`](https://github.com/humbertogontijo/python-roborock/commit/9256849252f019f4fea2f59384bc0ea7c57adb5c))
23-
* Lowercase true ([`774c3cc`](https://github.com/humbertogontijo/python-roborock/commit/774c3cc9765ee76a3a553ca6911751124ae7164c))
24-
* Semantic release not updating changelong ([`eaf6e90`](https://github.com/humbertogontijo/python-roborock/commit/eaf6e90264b6ab69549da0e5bc3d17c4c0a2c07c))
30+
31+
- Trigger release ([`f1ce0ed`](https://github.com/humbertogontijo/python-roborock/commit/f1ce0ed55a254bccd8567b48974ff74dd9ec8b25))
32+
- Trigger release ([`9a4462c`](https://github.com/humbertogontijo/python-roborock/commit/9a4462c800762393cc047085156acbe119cd0fe4))
33+
- Trigger release ([`b7a664b`](https://github.com/humbertogontijo/python-roborock/commit/b7a664b15b7c5180d816de325537693f47c24860))
34+
- Trigger release ([`9256849`](https://github.com/humbertogontijo/python-roborock/commit/9256849252f019f4fea2f59384bc0ea7c57adb5c))
35+
- Lowercase true ([`774c3cc`](https://github.com/humbertogontijo/python-roborock/commit/774c3cc9765ee76a3a553ca6911751124ae7164c))
36+
- Semantic release not updating changelong ([`eaf6e90`](https://github.com/humbertogontijo/python-roborock/commit/eaf6e90264b6ab69549da0e5bc3d17c4c0a2c07c))

0 commit comments

Comments
 (0)