Skip to content

Commit dcbcfc4

Browse files
LimychLimych
committed
Merge remote-tracking branch 'blueprint/dev' into dev
# Conflicts: # README.md
2 parents c3e1b55 + 47bd29f commit dcbcfc4

File tree

14 files changed

+108
-36
lines changed

14 files changed

+108
-36
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
22
{
3-
"image": "ludeeus/container:integration-debian",
3+
"image": "ghcr.io/ludeeus/devcontainer/integration:stable",
44
"name": "Blueprint integration development",
55
"context": "..",
66
"appPort": [
@@ -27,4 +27,4 @@
2727
"editor.formatOnType": true,
2828
"files.trimTrailingWhitespace": true
2929
}
30-
}
30+
}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ dev ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ dev ]
20+
schedule:
21+
- cron: '37 1 * * 1'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'python' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v3
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
# queries: security-extended,security-and-quality
54+
55+
56+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
57+
# If this step fails, then you should remove it and run the build manually (see below)
58+
- name: Autobuild
59+
uses: github/codeql-action/autobuild@v2
60+
61+
# ℹ️ Command-line programs to run using the OS shell.
62+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
63+
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
65+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
66+
67+
# - run: |
68+
# echo "Run, Build Application using script"
69+
# ./location_of_script_within_repo/buildscript.sh
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v2

‎.github/workflows/hacs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: "ubuntu-latest"
1313
name: HACS
1414
steps:
15-
- uses: "actions/checkout@v2"
15+
- uses: "actions/checkout@v3"
1616
- name: HACS validation
1717
uses: "hacs/action@main"
1818
with:

‎.github/workflows/hassfest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
validate:
1111
runs-on: "ubuntu-latest"
1212
steps:
13-
- uses: "actions/checkout@v2"
13+
- uses: "actions/checkout@v3"
1414
- uses: home-assistant/actions/hassfest@master

‎.github/workflows/py-dead-code.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: "Checkout code"
12-
uses: actions/checkout@master
12+
uses: actions/checkout@v3
1313

1414
- run: |
1515
echo "package=$(ls -F | grep \/$ | grep -v "bin\|examples\|tests" | sed -n "s/\///g;1p")" >> $GITHUB_ENV
1616
1717
- name: "Set up Python"
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v3
1919
with:
20-
python-version: '3.8'
20+
python-version: '3.9'
2121

2222
- name: "Cache pip"
23-
uses: actions/cache@v2.1.7
23+
uses: actions/cache@v3
2424
with:
2525
# This path is specific to Ubuntu
2626
path: ~/.cache/pip

‎.github/workflows/py-test.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: "Checkout code"
20-
uses: actions/checkout@master
20+
uses: actions/checkout@v3
2121

2222
- run: |
2323
echo "package=$(ls -F | grep \/$ | grep -v "bin\|examples\|tests" | sed -n "s/\///g;1p")" >> $GITHUB_ENV
2424
2525
- name: "Set up Python"
26-
uses: actions/setup-python@v2
26+
uses: actions/setup-python@v3
2727
with:
28-
python-version: '3.8'
28+
python-version: '3.9'
2929

3030
- name: "Cache pip"
31-
uses: actions/cache@v2.1.7
31+
uses: actions/cache@v3
3232
with:
3333
# This path is specific to Ubuntu
3434
path: ~/.cache/pip
@@ -66,18 +66,18 @@ jobs:
6666
strategy:
6767
max-parallel: 3
6868
matrix:
69-
python-version: [3.8, 3.9]
69+
python-version: ['3.9', '3.10']
7070
steps:
7171
- name: "Checkout code"
72-
uses: actions/checkout@master
72+
uses: actions/checkout@v3
7373

7474
- name: Set up Python ${{ matrix.python-version }}
75-
uses: actions/setup-python@v2
75+
uses: actions/setup-python@v3
7676
with:
7777
python-version: ${{ matrix.python-version }}
7878

7979
- name: "Cache pip"
80-
uses: actions/cache@v2.1.7
80+
uses: actions/cache@v3
8181
with:
8282
# This path is specific to Ubuntu
8383
path: ~/.cache/pip
@@ -105,24 +105,24 @@ jobs:
105105
fi
106106
107107
- name: "Run tests with pytest"
108-
if: matrix.python-version != '3.8'
108+
if: matrix.python-version != '3.9'
109109
run: |
110110
pytest --basetemp=$RUNNER_TEMP --durations=10 -n auto --dist=loadfile -qq -o console_output_style=count -p no:sugar
111111
./bin/check_dirty
112112
113113
- name: "Install Coveralls"
114-
if: matrix.python-version == '3.8'
114+
if: matrix.python-version == '3.9'
115115
run: |
116116
pip install pytest-xdist coveralls
117117
118118
- name: "Run tests with pytest & Calculate coverage"
119-
if: matrix.python-version == '3.8'
119+
if: matrix.python-version == '3.9'
120120
run: |
121121
pytest --basetemp=$RUNNER_TEMP --durations=10 -n auto --dist=loadfile -qq -o console_output_style=count -p no:sugar --cov --cov-report=
122122
./bin/check_dirty
123123
124124
- name: "Send coverage to Coveralls"
125-
if: matrix.python-version == '3.8'
125+
if: matrix.python-version == '3.9'
126126
env:
127127
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128128
run: coveralls --service=github

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: "Check out repository"
15-
uses: actions/checkout@v1
15+
uses: actions/checkout@v3
1616

1717
- working-directory: ./custom_components
1818
run: |
@@ -49,20 +49,20 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- name: "Check out repository"
52-
uses: actions/checkout@v1
52+
uses: actions/checkout@v3
5353

5454
- working-directory: ./custom_components
5555
run: |
5656
echo "release_version=$(git describe --abbrev=0 | sed s/v//)" >> $GITHUB_ENV
5757
5858
- name: "Set up Python"
5959
if: env.release_version != '' && success()
60-
uses: actions/setup-python@v2
60+
uses: actions/setup-python@v3
6161
with:
6262
python-version: 3.9
6363

6464
- name: "Cache pip"
65-
uses: actions/cache@v2.1.7
65+
uses: actions/cache@v3
6666
with:
6767
# This path is specific to Ubuntu
6868
path: ~/.cache/pip

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: pyupgrade
1313
args: [--py37-plus]
1414
- repo: https://github.com/psf/black
15-
rev: 20.8b1
15+
rev: 22.3.0
1616
hooks:
1717
- id: black
1818
args:

‎bin/devcontainer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ workdir="/workspaces/${workspace}"
1616

1717
container="dev-${workspace}"
1818
port="127.0.0.1:9123:8123"
19-
image="ludeeus/container:integration-debian"
19+
image="ghcr.io/ludeeus/devcontainer/integration:stable"
2020
volume="${ROOT}:${workdir}"
2121

2222
cmd="menu"

‎custom_components/iaquk/const.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Base component constants
77
NAME: Final = "Indoor Air Quality UK Index"
88
DOMAIN: Final = "iaquk"
9-
VERSION: Final = "1.6.2"
9+
VERSION: Final = "1.6.3-alpha"
1010
ISSUE_URL: Final = "https://github.com/Limych/ha-iaquk/issues"
1111

1212
STARTUP_MESSAGE: Final = f"""

0 commit comments

Comments
 (0)