Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
zlinoliver authored Oct 19, 2023
2 parents 2f353ec + d00934a commit 7e3632f
Show file tree
Hide file tree
Showing 85 changed files with 5,460 additions and 5,053 deletions.
3 changes: 2 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ omit =
homeassistant/components/comelit/cover.py
homeassistant/components/comelit/coordinator.py
homeassistant/components/comelit/light.py
homeassistant/components/comelit/switch.py
homeassistant/components/comfoconnect/fan.py
homeassistant/components/concord232/alarm_control_panel.py
homeassistant/components/concord232/binary_sensor.py
Expand Down Expand Up @@ -789,6 +790,7 @@ omit =
homeassistant/components/mystrom/binary_sensor.py
homeassistant/components/mystrom/light.py
homeassistant/components/mystrom/switch.py
homeassistant/components/mystrom/sensor.py
homeassistant/components/nad/media_player.py
homeassistant/components/nanoleaf/__init__.py
homeassistant/components/nanoleaf/button.py
Expand Down Expand Up @@ -1116,7 +1118,6 @@ omit =
homeassistant/components/sesame/lock.py
homeassistant/components/seven_segments/image_processing.py
homeassistant/components/seventeentrack/sensor.py
homeassistant/components/shiftr/*
homeassistant/components/shodan/sensor.py
homeassistant/components/sia/__init__.py
homeassistant/components/sia/alarm_control_panel.py
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
publish: ${{ steps.version.outputs.publish }}
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
fetch-depth: 0

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/[email protected]
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
arch: ${{ fromJson(needs.init.outputs.architectures) }}
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Download nightly wheels of frontend
if: needs.init.outputs.channel == 'dev'
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
- green
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Set build additional args
run: |
Expand Down Expand Up @@ -289,7 +289,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Initialize git
uses: home-assistant/actions/helpers/git-init@master
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
id-token: write
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Install Cosign
uses: sigstore/[email protected]
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Generate partial Python venv restore key
id: generate_python_cache_key
run: >-
Expand Down Expand Up @@ -224,7 +224,7 @@ jobs:
- info
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
- pre-commit
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/[email protected]
id: python
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
- pre-commit
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/[email protected]
id: python
Expand Down Expand Up @@ -386,7 +386,7 @@ jobs:
- pre-commit
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/[email protected]
id: python
Expand Down Expand Up @@ -480,7 +480,7 @@ jobs:
python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -548,7 +548,7 @@ jobs:
- base
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -580,7 +580,7 @@ jobs:
- base
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -613,7 +613,7 @@ jobs:
- base
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -657,7 +657,7 @@ jobs:
- base
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -739,7 +739,7 @@ jobs:
bluez \
ffmpeg
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -891,7 +891,7 @@ jobs:
ffmpeg \
libmariadb-dev-compat
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -1015,7 +1015,7 @@ jobs:
ffmpeg \
postgresql-server-dev-14
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/[email protected]
Expand Down Expand Up @@ -1110,7 +1110,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Check out code from GitHub
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Download all coverage artifacts
uses: actions/download-artifact@v3
- name: Upload coverage to Codecov (full coverage)
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "CodeQL"

# yamllint disable-line rule:truthy
on:
push:
branches:
- dev
- rc
- master
pull_request:
branches:
- dev
schedule:
- cron: "30 18 * * 4"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
timeout-minutes: 360
permissions:
actions: read
contents: read
security-events: write

steps:
- name: Check out code from GitHub
uses: actions/[email protected]

- name: Initialize CodeQL
uses: github/codeql-action/[email protected]
with:
languages: python

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected]
with:
category: "/language:python"
2 changes: 1 addition & 1 deletion .github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Set up Python ${{ env.DEFAULT_PYTHON }}
uses: actions/[email protected]
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
architectures: ${{ steps.info.outputs.architectures }}
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Get information
id: info
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
arch: ${{ fromJson(needs.init.outputs.architectures) }}
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Download env_file
uses: actions/download-artifact@v3
Expand All @@ -99,7 +99,7 @@ jobs:
name: requirements_diff

- name: Build wheels
uses: home-assistant/[email protected].4
uses: home-assistant/[email protected].5
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
Expand All @@ -124,7 +124,7 @@ jobs:
arch: ${{ fromJson(needs.init.outputs.architectures) }}
steps:
- name: Checkout the repository
uses: actions/[email protected].0
uses: actions/[email protected].1

- name: Download env_file
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
sed -i "/numpy/d" homeassistant/package_constraints.txt
- name: Build wheels (old cython)
uses: home-assistant/[email protected].4
uses: home-assistant/[email protected].5
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
Expand All @@ -205,7 +205,7 @@ jobs:
pip: "'cython<3'"

- name: Build wheels (part 1)
uses: home-assistant/[email protected].4
uses: home-assistant/[email protected].5
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
Expand All @@ -219,7 +219,7 @@ jobs:
requirements: "requirements_all.txtaa"

- name: Build wheels (part 2)
uses: home-assistant/[email protected].4
uses: home-assistant/[email protected].5
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
Expand All @@ -233,7 +233,7 @@ jobs:
requirements: "requirements_all.txtab"

- name: Build wheels (part 3)
uses: home-assistant/[email protected].4
uses: home-assistant/[email protected].5
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
Expand Down
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ ignored:
- DL3008
- DL3013
- DL3018
- DL3042
16 changes: 2 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,29 @@ COPY requirements.txt homeassistant/
COPY homeassistant/package_constraints.txt homeassistant/homeassistant/
RUN \
pip3 install \
--no-cache-dir \
--only-binary=:all: \
--index-url "https://wheels.home-assistant.io/musllinux-index/" \
-r homeassistant/requirements.txt

COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
RUN \
if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \
pip3 install \
--no-cache-dir \
--no-index \
homeassistant/home_assistant_frontend-*.whl; \
pip3 install homeassistant/home_assistant_frontend-*.whl; \
fi \
&& if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \
pip3 install \
--no-cache-dir \
--no-index \
homeassistant/home_assistant_intents-*.whl; \
pip3 install homeassistant/home_assistant_intents-*.whl; \
fi \
&& \
LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \
pip3 install \
--no-cache-dir \
--only-binary=:all: \
--index-url "https://wheels.home-assistant.io/musllinux-index/" \
-r homeassistant/requirements_all.txt

## Setup Home Assistant Core
COPY . homeassistant/
RUN \
pip3 install \
--no-cache-dir \
--only-binary=:all: \
--index-url "https://wheels.home-assistant.io/musllinux-index/" \
-e ./homeassistant \
&& python3 -m compileall \
homeassistant/homeassistant
Expand Down
10 changes: 5 additions & 5 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
image: ghcr.io/home-assistant/{arch}-homeassistant
build_from:
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.09.0
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.09.0
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.09.0
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.09.0
i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.09.0
aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.10.0
armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.10.0
armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.10.0
amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.10.0
i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.10.0
codenotary:
signer: [email protected]
base_image: [email protected]
Expand Down
Loading

0 comments on commit 7e3632f

Please sign in to comment.