Skip to content

Commit bf780d9

Browse files
authored
Merge branch 'master' into master
2 parents 884c428 + 9411609 commit bf780d9

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

custom_components/pyscript/eval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ async def ast_try(self, arg):
12931293
for arg1 in arg.finalbody:
12941294
val = await self.aeval(arg1)
12951295
if isinstance(val, EvalStopFlow):
1296-
return val # pylint: disable=lost-exception
1296+
return val # pylint: disable=lost-exception,return-in-finally
12971297
return None
12981298

12991299
async def ast_raise(self, arg):

custom_components/pyscript/jupyter_kernel.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ async def shell_handler(self, shell_socket, wire_msg):
344344
"code": msg["content"]["code"],
345345
}
346346
await self.send(self.iopub_socket, "execute_input", content, parent_header=msg["header"])
347+
result = None
347348

348349
code = msg["content"]["code"]
349350
#

setup.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ classifier =
1111
Intended Audience :: Developers
1212
License :: OSI Approved :: Apache Software License
1313
Operating System :: OS Independent
14-
Programming Language :: Python :: 3.9
14+
Programming Language :: Python :: 3.12
1515
Topic :: Home Automation
1616

1717
[tool:pytest]
@@ -32,12 +32,14 @@ max-line-length = 109
3232
# E203: Whitespace before ':'
3333
# D202 No blank lines allowed after function docstring
3434
# W504 line break after binary operator
35+
# E231 missing whitespace after ':'
3536
ignore =
3637
E501,
3738
W503,
3839
E203,
3940
D202,
4041
W504
42+
E231
4143

4244
[isort]
4345
# https://github.com/timothycrosley/isort
@@ -58,7 +60,7 @@ forced_separate = tests
5860
combine_as_imports = true
5961

6062
[mypy]
61-
python_version = 3.9
63+
python_version = 3.12
6264
ignore_errors = true
6365
follow_imports = silent
6466
ignore_missing_imports = true

tests/requirements_test.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
coverage==7.5.0
2-
croniter==2.0.5
3-
watchdog==4.0.1
1+
coverage==7.5.3
2+
croniter==2.0.2
3+
watchdog==2.3.1
44
mock-open==1.4.0
5-
mypy==1.10.0
5+
mypy==1.10.1
66
pre-commit==3.7.1
77
pytest==8.2.0
88
pytest-cov==5.0.0
9-
pytest-homeassistant-custom-component==0.13.135
10-
pylint==3.2.3
11-
pylint-strict-informational==0.1
9+
pytest-homeassistant-custom-component==0.13.145
10+
pylint==3.2.5
11+
pylint-strict-informational==0.1

0 commit comments

Comments
 (0)