Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix-async
Browse files Browse the repository at this point in the history
  • Loading branch information
basnijholt committed Jan 1, 2025
2 parents 7372cb2 + b3e4d09 commit c85254b
Show file tree
Hide file tree
Showing 28 changed files with 1,087 additions and 177 deletions.
45 changes: 45 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,51 @@
"contributions": [
"translation"
]
},
{
"login": "TamilNeram",
"name": "தமிழ் நேரம்",
"avatar_url": "https://avatars.githubusercontent.com/u/67970539?v=4",
"profile": "https://github.com/TamilNeram",
"contributions": [
"translation"
]
},
{
"login": "Thunderstrike116",
"name": "Thunderstrike116",
"avatar_url": "https://avatars.githubusercontent.com/u/23220766?v=4",
"profile": "https://github.com/Thunderstrike116",
"contributions": [
"translation"
]
},
{
"login": "immeteor2",
"name": "immeteor2",
"avatar_url": "https://avatars.githubusercontent.com/u/125735487?v=4",
"profile": "https://github.com/immeteor2",
"contributions": [
"translation"
]
},
{
"login": "pbassut",
"name": "Patrick Bassut",
"avatar_url": "https://avatars.githubusercontent.com/u/1500037?v=4",
"profile": "https://github.com/pbassut",
"contributions": [
"translation"
]
},
{
"login": "Ricky-Tigg",
"name": "Ricky Tigg",
"avatar_url": "https://avatars.githubusercontent.com/u/26058215?v=4",
"profile": "https://github.com/Ricky-Tigg",
"contributions": [
"translation"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you need help with using or configuring Adaptive Lighting, please [open a Q&A
Please confirm that you have completed the following steps:

- [ ] I have updated to the [latest Adaptive Lighting version](https://github.com/basnijholt/adaptive-lighting/releases) available in [HACS](https://hacs.xyz/).
- [ ] I have reviewed the [Troubleshooting Section](https://github.com/basnijholt/adaptive-lighting#troubleshooting) in the [README](https://github.com/basnijholt/adaptive-lighting#readme).
- [ ] I have reviewed the [Troubleshooting Section](https://github.com/basnijholt/adaptive-lighting#sos-troubleshooting) in the [README](https://github.com/basnijholt/adaptive-lighting#readme).
- [ ] (If using Zigbee2MQTT) I have read the [Zigbee2MQTT troubleshooting guide](https://github.com/basnijholt/adaptive-lighting#zigbee2mqtt) in the [README](https://github.com/basnijholt/adaptive-lighting#readme).
- [ ] I have checked the [V2 Roadmap](https://github.com/basnijholt/adaptive-lighting/discussions/291) and [open issues](https://github.com/basnijholt/adaptive-lighting/issues) to ensure my issue isn't a duplicate.

Expand Down
38 changes: 38 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"rebaseWhen": "behind-base-branch",
"dependencyDashboard": true,
"labels": [
"dependencies",
"no-stale"
],
"commitMessagePrefix": "⬆️",
"commitMessageTopic": "{{depName}}",
"prBodyDefinitions": {
"Release": "yes"
},
"packageRules": [
{
"matchManagers": [
"github-actions"
],
"addLabels": [
"github_actions"
],
"rangeStrategy": "pin"
},
{
"matchManagers": [
"github-actions"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"automerge": true
}
],
"extends": [
"config:recommended"
]
}
13 changes: 7 additions & 6 deletions .github/workflows/deploy-webapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set Up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Install Dependencies
run: |
pip install -r webapp/requirements-locked.txt
pip install -r webapp/requirements.txt
pip install shinylive
- name: Build the WebAssembly app
run: |
Expand All @@ -49,14 +50,14 @@ jobs:
shinylive export webapp site
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
# Upload the 'site' directory, where your app has been built
path: "site"

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
8 changes: 4 additions & 4 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
- linux/arm64
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
# Only push on the master branch
push: ${{ github.ref == 'refs/heads/master' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hassfest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ jobs:
validate_hassfest:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3.0.2"
- uses: "actions/checkout@v4.2.2"
- uses: home-assistant/actions/hassfest@master
6 changes: 3 additions & 3 deletions .github/workflows/install_dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ runs:
using: "composite"
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.repository }}
ref: ${{ github.ref }}
persist-credentials: false
fetch-depth: 0
- name: Check out code from GitHub
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: home-assistant/core
path: core
ref: ${{ inputs.core-version }}
- name: Set up Python ${{ inputs.python-version }}
id: python
uses: actions/setup-python@v4.1.0
uses: actions/setup-python@v5.3.0
with:
python-version: ${{ inputs.python-version }}
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-to-master-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected].0
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected].1
12 changes: 10 additions & 2 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
pytest:
name: Run pytest
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 60
strategy:
fail-fast: false
Expand Down Expand Up @@ -58,11 +58,19 @@ jobs:
core-version: "2024.7.4"
- python-version: "3.12"
core-version: "2024.8.3"
- python-version: "3.12"
core-version: "2024.9.3"
- python-version: "3.12"
core-version: "2024.10.4"
- python-version: "3.12"
core-version: "2024.11.3"
- python-version: "3.12"
core-version: "2024.12.0"
- python-version: "3.12"
core-version: "dev"
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Home Assistant
uses: ./.github/workflows/install_dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
- uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/update-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code from GitHub
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Home Assistant
uses: ./.github/workflows/install_dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
validate_hacs:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"
- name: HACS validation
uses: "hacs/action@main"
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Optionally build the image yourself with:
# docker build -t basnijholt/adaptive-lighting:latest .

FROM python:3.12-bookworm
FROM python:3.13-bookworm

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
Expand Down
Loading

0 comments on commit c85254b

Please sign in to comment.