Skip to content

Commit ba3342e

Browse files
authored
Merge branch 'dev' into pip-upgrade
2 parents dea0c6b + 91c7920 commit ba3342e

28 files changed

+1027
-792
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Bug Report
1+
name: Issue Report
22
description: Report an issue with AppDaemon.
3-
labels: ["bug"]
3+
labels: ["issue"]
44
body:
55
- type: markdown
66
attributes:
77
value: |
8-
Thanks for taking the time to fill out this bug report!
8+
Thanks for taking the time to fill out this issue report!
99
- type: textarea
1010
id: what-happened
1111
attributes:

.github/workflows/build-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
# https://github.com/docker/build-push-action
152152
- name: Build and push Docker image
153153
id: build-and-push
154-
uses: docker/build-push-action@v6.17.0
154+
uses: docker/build-push-action@v6.18.0
155155
with:
156156
context: .
157157
push: ${{github.event_name == 'push' && (startsWith(github.ref, 'refs/tags') || github.ref_name == 'dev') && github.repository == 'AppDaemon/appdaemon'}}

appdaemon/__main__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ def main(self): # noqa: C901
335335
print(e)
336336
sys.exit(1)
337337

338-
self.logging = Logging(model.model_dump(mode='python')['logs'], args.debug)
338+
log_cfg = model.model_dump(mode='python', by_alias=True)['logs']
339+
self.logging = Logging(log_cfg, args.debug)
339340
self.logger = self.logging.get_logger()
340341

341342
if "time_zone" in config["appdaemon"]:

0 commit comments

Comments
 (0)