Skip to content

Commit f7287bf

Browse files
committed
Merge branch 'main' into async
2 parents e49c36e + 7812521 commit f7287bf

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
39+
uses: actions/checkout@v4.2.2
4040

4141
# Initializes the CodeQL tools for scanning.
4242
- name: Initialize CodeQL

.github/workflows/verify.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ jobs:
244244
with:
245245
name: coverage-${{ matrix.python-version }}
246246
path: .coverage
247+
if-no-files-found: error
248+
include-hidden-files: true
247249

248250
mypy:
249251
runs-on: ubuntu-latest
@@ -346,7 +348,7 @@ jobs:
346348
echo "***"
347349
coverage xml
348350
- name: Upload coverage to Codecov
349-
uses: codecov/codecov-action@v4
351+
uses: codecov/codecov-action@v5
350352
env:
351353
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
352354

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ repos:
2020
# - --fix
2121

2222
- repo: https://github.com/pre-commit/pre-commit-hooks
23-
rev: v4.6.0
23+
rev: v5.0.0
2424
hooks:
2525
- id: check-executables-have-shebangs
2626
stages: [manual]
2727
- id: no-commit-to-branch
2828
args:
2929
- --branch=main
3030
- repo: https://github.com/asottile/pyupgrade
31-
rev: v3.17.0
31+
rev: v3.19.0
3232
hooks:
3333
- id: pyupgrade
3434
args: [--py39-plus]
@@ -39,7 +39,7 @@ repos:
3939
- id: codespell
4040
exclude_types: [csv, json]
4141
- repo: https://github.com/PyCQA/bandit
42-
rev: 1.7.9
42+
rev: 1.8.0
4343
hooks:
4444
- id: bandit
4545
args:
@@ -52,13 +52,13 @@ repos:
5252
hooks:
5353
- id: yamllint
5454
- repo: https://github.com/biomejs/pre-commit
55-
rev: v0.4.0
55+
rev: v0.5.0
5656
hooks:
5757
- id: biome-lint
5858
additional_dependencies: ["@biomejs/biome@1.8.3"]
5959
name: "Verifying/updating code with biome (improved prettier)"
6060
- repo: https://github.com/cdce8p/python-typing-update
61-
rev: v0.6.0
61+
rev: v0.7.0
6262
hooks:
6363
# Run `python-typing-update` hook manually from time to time
6464
# to update python typing syntax.
@@ -102,6 +102,6 @@ repos:
102102
language: script
103103
pass_filenames: false
104104
- repo: https://github.com/igorshubovych/markdownlint-cli
105-
rev: v0.41.0
105+
rev: v0.43.0
106106
hooks:
107107
- id: markdownlint

pyproject.toml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools~=72.1", "wheel~=0.44.0"]
2+
requires = ["setuptools~=75.1", "wheel~=0.45.0"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -44,8 +44,11 @@ dependencies = [
4444
platforms = ["any"]
4545
include-package-data = true
4646

47+
[tool.setuptools.package-data]
48+
"plugwise" = ["py.typed"]
49+
4750
[tool.setuptools.packages.find]
48-
include = ["plugwise_usb*"]
51+
include = ["plugwise*"]
4952

5053
[tool.black]
5154
target-version = ["py312"]
@@ -57,7 +60,7 @@ profile = "black"
5760
# will group `import x` and `from x import` of the same module.
5861
force_sort_within_sections = true
5962
known_first_party = [
60-
"plugwise_usb",
63+
"plugwise",
6164
"homeassistant",
6265
"tests",
6366
]
@@ -113,18 +116,23 @@ good-names = [
113116
# too-many-ancestors - it's too strict.
114117
# wrong-import-order - isort guards this
115118
disable = [
116-
"format",
117119
"abstract-method",
118120
"consider-using-f-string",
119121
"cyclic-import",
120122
"duplicate-code",
121123
"fixme",
124+
"format",
122125
"inconsistent-return-statements",
123126
"locally-disabled",
127+
"missing-class-docstring",
128+
"missing-function-docstring",
129+
"missing-module-docstring",
124130
"not-context-manager",
131+
"raise-missing-from",
125132
"too-few-public-methods",
126133
"too-many-ancestors",
127134
"too-many-arguments",
135+
"too-many-boolean-expressions",
128136
"too-many-branches",
129137
"too-many-instance-attributes",
130138
"too-many-lines",
@@ -133,14 +141,9 @@ disable = [
133141
"too-many-public-methods",
134142
"too-many-return-statements",
135143
"too-many-statements",
136-
"too-many-boolean-expressions",
144+
"too-many-nested-blocks",
137145
"unused-argument",
138146
"wrong-import-order",
139-
"raise-missing-from",
140-
"missing-class-docstring",
141-
"missing-function-docstring",
142-
"missing-module-docstring",
143-
"too-many-nested-blocks",
144147
]
145148
# for now (20201031) added the below while we are codemerging/-improving
146149
# too-many-positional-arguments
@@ -209,7 +212,7 @@ warn_unreachable = true
209212
exclude = []
210213

211214
[tool.coverage.run]
212-
source = [ "plugwise_usb" ]
215+
source = [ "plugwise" ]
213216
omit= [
214217
"*/venv/*",
215218
"setup.py",
@@ -239,7 +242,7 @@ lint.select = [
239242
"N804", # First argument of a class method should be named cls
240243
"N805", # First argument of a method should be named self
241244
"N815", # Variable {name} in class scope should not be mixedCase
242-
# "PGH001", # No builtin eval() allowed remapped to S307
245+
# "PGH001", # PGH001 has been remapped to S307
243246
"PGH004", # Use specific rule codes when using noqa
244247
"PL", # https://github.com/astral-sh/ruff/issues/7491#issuecomment-1730008111
245248
"PLC0414", # Useless import alias. Import alias does not rename original package.
@@ -279,7 +282,7 @@ lint.select = [
279282
"T20", # flake8-print
280283
"TID251", # Banned imports
281284
"TRY004", # Prefer TypeError exception for invalid type
282-
# "TRY200", # Use raise from to specify exception cause
285+
# "TRY200", # TRY200 has been remapped to B904
283286
"TRY302", # Remove exception handler; error is immediately re-raised
284287
"UP", # pyupgrade
285288
"W", # pycodestyle

0 commit comments

Comments
 (0)