Merge branch 'dev' of https://github.com/AppDaemon/appdaemon into dev

AppDaemon · Jan 29, 2024 · f8f5793 · f8f5793
2 parents 89839c2 + 377bd65
commit f8f5793
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -29,7 +29,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # https://github.com/actions/setup-python
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # https://github.com/actions/setup-python
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -109,27 +109,27 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Python package
         uses: actions/download-artifact@v3
         with:
           name: python-package
           path: dist/
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2.4.1
+        uses: docker/setup-buildx-action@v3.0.0
       # Login against a Docker registry (only with a tag or push on `dev` branch)
       # https://github.com/docker/login-action
       - name: Log into Docker Hub
         if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags') || github.ref_name == 'dev') && github.repository == 'AppDaemon/appdaemon'
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4.4.0
+        uses: docker/metadata-action@v5.5.0
         with:
           images: ${{ env.IMAGE_NAME }}
           # Customize the generation of Docker `latest` tag
@@ -151,7 +151,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           push: ${{github.event_name == 'push' && (startsWith(github.ref, 'refs/tags') || github.ref_name == 'dev') && github.repository == 'AppDaemon/appdaemon'}}

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     # https://github.com/actions/setup-python
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -35,7 +35,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     # https://github.com/actions/setup-python
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --extra=dev --output-file=dev-requirements.txt --resolver=backtracking pyproject.toml
 #
-aiohttp==3.8.6
+aiohttp==3.9.2
     # via
     #   aiohttp-jinja2
     #   appdaemon (pyproject.toml)
@@ -128,7 +128,7 @@ pyyaml==6.0.1
     #   pre-commit
 requests==2.28.2
     # via appdaemon (pyproject.toml)
-ruff==0.0.292
+ruff==0.1.14
     # via appdaemon (pyproject.toml)
 sgmllib3k==1.0.0
     # via feedparser

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --extra=doc --output-file=doc-requirements.txt --resolver=backtracking pyproject.toml
 #
-aiohttp==3.8.6
+aiohttp==3.9.2
     # via
     #   aiohttp-jinja2
     #   appdaemon (pyproject.toml)

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ requires-python = ">=3.8"
 keywords=[ "appdaemon", "home", "automation" ]
 dependencies = [
     'importlib-metadata; python_version<"3.8"',
-    'aiohttp ~= 3.8.4',
+    'aiohttp >= 3.8.4,< 3.10.0',
     'aiohttp_jinja2 ~= 1.5.1',
     'astral ~= 3.2',
     'bcrypt ~= 4.0.1',
@@ -59,7 +59,7 @@ dev = [
     "black >= 23.1,< 23.4",
     'pre-commit =~ 3.6.0; python_version>"3.7"',  # pre-commit does not support Python < 3.8
     "pytest >= 7.2.1,< 7.4.0",
-    "ruff~= 0.0.261"
+    "ruff>= 0.0.261,< 0.2.0"
 ]
 
 # Dependencies required to build the documentation using sphinx

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile --resolver=backtracking pyproject.toml
 #
-aiohttp==3.8.6
+aiohttp==3.9.2
     # via
     #   aiohttp-jinja2
     #   appdaemon (pyproject.toml)