Skip to content

Commit 6920552

Browse files
committed
Merge branch 'dev'
2 parents 929ab84 + 4875916 commit 6920552

55 files changed

Lines changed: 2695 additions & 1326 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-deploy.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
packages: write
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333
# https://github.com/actions/setup-python
3434
- name: Set up Python
3535
uses: actions/setup-python@v6
@@ -56,7 +56,7 @@ jobs:
5656
working-directory: docs
5757
# Save the generated documentation as an artifact in Github
5858
- name: Upload documentation
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@v6
6060
with:
6161
name: python-doc-package
6262
path: docs/_build/
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout repository
74-
uses: actions/checkout@v5
74+
uses: actions/checkout@v6
7575
# https://github.com/actions/setup-python
7676
- name: Set up Python
7777
uses: actions/setup-python@v6
@@ -87,7 +87,7 @@ jobs:
8787
- name: Build Python package
8888
run: python -m build
8989
- name: Upload Python package
90-
uses: actions/upload-artifact@v4
90+
uses: actions/upload-artifact@v6
9191
with:
9292
name: python-package
9393
path: dist/
@@ -109,14 +109,14 @@ jobs:
109109

110110
steps:
111111
- name: Checkout repository
112-
uses: actions/checkout@v5
112+
uses: actions/checkout@v6
113113
- name: Download Python package
114-
uses: actions/download-artifact@v5.0.0
114+
uses: actions/download-artifact@v7.0.0
115115
with:
116116
name: python-package
117117
path: dist/
118118
- name: Setup Docker buildx
119-
uses: docker/setup-buildx-action@v3.11.1
119+
uses: docker/setup-buildx-action@v3.12.0
120120
# Login against a Docker registry (only with a tag or push on `dev` branch)
121121
# https://github.com/docker/login-action
122122
- name: Log into Docker Hub
@@ -129,7 +129,7 @@ jobs:
129129
# https://github.com/docker/metadata-action
130130
- name: Extract Docker metadata
131131
id: meta
132-
uses: docker/metadata-action@v5.8.0
132+
uses: docker/metadata-action@v5.10.0
133133
with:
134134
images: ${{ env.IMAGE_NAME }}
135135
# Customize the generation of Docker `latest` tag

.github/workflows/codespell.yml

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

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
- name: Annotate locations with typos
2323
uses: codespell-project/codespell-problem-matcher@v1
2424
- name: Codespell

.github/workflows/python-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
lint:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- name: Install uv and set the python version
1717
id: setup-uv
18-
uses: astral-sh/setup-uv@v6
18+
uses: astral-sh/setup-uv@v7
1919
with:
2020
version: "0.8.15" # It is considered best practice to pin to a specific uv version
2121
# https://github.com/astral-sh/setup-uv?tab=readme-ov-file#enable-caching
@@ -44,13 +44,13 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
python-version: ["3.10", "3.11", "3.12"]
47+
python-version: ["3.10", "3.11", "3.12", "3.13"]
4848

4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151
- name: Install uv and set the python version
5252
id: setup-uv
53-
uses: astral-sh/setup-uv@v6
53+
uses: astral-sh/setup-uv@v7
5454
with:
5555
# https://docs.astral.sh/uv/guides/integration/github/#multiple-python-versions
5656
python-version: ${{ matrix.python-version }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ nosetests.xml
4646
coverage.xml
4747
*,cover
4848
.hypothesis/
49+
tests/conf/namespaces
4950

5051
# Translations
5152
*.mo

.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.13

appdaemon/__main__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ def __init__(self, args: argparse.Namespace) -> None:
296296
self.dep_manager = DependencyManager.from_app_directory(
297297
self.model.appdaemon.app_dir,
298298
exclude=self.model.appdaemon.exclude_dirs,
299-
config_suffix=self.model.appdaemon.ext,
300299
)
301300

302301
except Exception as e:
@@ -341,6 +340,7 @@ def handle_sig(self, signum: int):
341340
342341
Signals:
343342
SIGUSR1 will result in internal info being dumped to the DIAG log
343+
SIGUSR2 will reload apps with modified code/config (useful in production_mode)
344344
SIGHUP will force a reload of all apps
345345
SIGINT and SIGTEM both result in AD shutting down
346346
"""
@@ -351,6 +351,8 @@ def handle_sig(self, signum: int):
351351
self.AD.thread_async.call_async_no_wait(self.AD.threading.dump_threads)
352352
self.AD.thread_async.call_async_no_wait(self.AD.app_management.dump_objects)
353353
self.AD.thread_async.call_async_no_wait(self.AD.sched.dump_sun)
354+
case signal.SIGUSR2:
355+
self.AD.thread_async.call_async_no_wait(self.AD.app_management.check_app_updates, mode=UpdateMode.NORMAL)
354356
case signal.SIGHUP:
355357
self.AD.thread_async.call_async_no_wait(self.AD.app_management.check_app_updates, mode=UpdateMode.TERMINATE)
356358
case (signal.SIGINT | signal.SIGTERM) as sig:

0 commit comments

Comments
 (0)