Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/pip/pre-commit-approx-eq-3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey "Limych" Khrolenok authored Feb 26, 2024
2 parents 66499a0 + 2a7b92c commit c010bb2
Show file tree
Hide file tree
Showing 15 changed files with 63 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ludeeus/integration_blueprint",
"image": "mcr.microsoft.com/vscode/devcontainers/python:0-3.11-bullseye",
"image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
"postCreateCommand": "scripts/setup",
"forwardPorts": [
8123
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
- type: textarea
attributes:
label: "System Health details"
description: "Paste the data from the System Health card in Home Assistant (https://www.home-assistant.io//more-info/system-health#github-issues)"
description: "Paste the data from the System Health card in Home Assistant (https://www.home-assistant.io/more-info/system-health#github-issues)"
validations:
required: true
- type: checkboxes
Expand All @@ -22,7 +22,7 @@ body:
required: true
- label: This issue only contains 1 issue (if you have multiple issues, open one issue for each issue).
required: true
- label: This issue is not a duplicate issue of currently [previous issues](https://github.com/ludeeus/integration_blueprint/issues?q=is%3Aissue+label%3A%22Bug%22+)..
- label: This issue is not a duplicate issue of any [previous issues](https://github.com/ludeeus/integration_blueprint/issues?q=is%3Aissue+label%3A%22Bug%22+)..
required: true
- type: textarea
attributes:
Expand All @@ -33,7 +33,7 @@ body:
- type: textarea
attributes:
label: Reproduction steps
description: "Without steps to reproduce, it will be hard to fix, it is very important that you fill out this part, issues without it will be closed"
description: "Without steps to reproduce, it will be hard to fix. It is very important that you fill out this part. Issues without it will be closed."
value: |
1.
2.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,4 +69,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout the repository"
uses: "actions/checkout@v4"
uses: "actions/checkout@v4.1.0"

- name: "Set up Python"
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
cache: "pip"

- name: "Install requirements"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/py-dead-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
echo "package=$(ls -F | grep \/$ | grep -v "scripts\|examples\|tests\|config" | sed -n "s/\///g;1p")" >> $GITHUB_ENV
- name: "Set up Python"
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.11'

- name: "Cache pip"
uses: actions/cache@v3
uses: actions/cache@v4
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/py-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
echo "package=$(ls -F | grep \/$ | grep -v "bin\|examples\|tests" | sed -n "s/\///g;1p")" >> $GITHUB_ENV
- name: "Set up Python"
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: "Cache pip"
uses: actions/cache@v3
uses: actions/cache@v4
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
Expand Down Expand Up @@ -67,22 +67,22 @@ jobs:
strategy:
max-parallel: 3
matrix:
python-version: ['3.10', '3.11']
python-version: ['3.11', '3.12']
experimental: [false]
include:
- python-version: '3.12'
experimental: true
# include:
# - python-version: '3.12'
# experimental: true
steps:
- name: "Checkout code"
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: "Cache pip"
uses: actions/cache@v3
uses: actions/cache@v4
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
name: "Publish new release"
runs-on: ubuntu-latest
steps:
- name: "Check out repository"
uses: actions/checkout@v4
- name: "Checkout the repository"
uses: "actions/checkout@v4.1.0"

- working-directory: ./custom_components
run: |
Expand Down Expand Up @@ -54,13 +54,13 @@ jobs:
- name: "Set up Python"
if: env.release_version != '' && success()
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

- name: "Cache pip"
if: env.release_version != '' && success()
uses: actions/cache@v3
uses: actions/cache@v4
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout the repository"
uses: "actions/checkout@v4"
uses: "actions/checkout@v4.1.0"

- name: "Run hassfest validation"
uses: "home-assistant/actions/hassfest@master"
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout the repository"
uses: "actions/checkout@v4"
uses: "actions/checkout@v4.1.0"

- name: "Run HACS validation"
uses: "hacs/action@main"
Expand Down
10 changes: 5 additions & 5 deletions custom_components/integration_blueprint/manifest.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"domain": "integration_blueprint",
"name": "Integration blueprint",
"domain": "",
"name": "",
"codeowners": [
"@Limych"
],
"config_flow": true,
"dependencies": [],
"documentation": "https://github.com/Limych/ha-blueprint",
"iot_class": "cloud_polling",
"issue_tracker": "https://github.com/Limych/ha-blueprint/issues",
"issue_tracker": "",
"requirements": [],
"version": "0.1.0"
}
"version": ""
}
18 changes: 18 additions & 0 deletions custom_components/integration_blueprint/translations/sk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"config": {
"step": {
"user": {
"description": "Ak potrebujete pomoc s konfiguráciou, pozrite sa sem: https://github.com/ludeeus/integration_blueprint",
"data": {
"username": "Užívateľské meno",
"password": "Heslo"
}
}
},
"error": {
"auth": "Používateľské meno/heslo je nesprávne.",
"connection": "Nedá sa pripojiť k serveru.",
"unknown": "Vyskytla sa neznáma chyba."
}
}
}
2 changes: 1 addition & 1 deletion hacs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "",
"filename": "integration_blueprint.zip",
"hide_default_branch": true,
"homeassistant": "2023.1.0",
"homeassistant": "2023.8.0",
"render_readme": true,
"zip_release": true
}
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r requirements-test.txt
black==23.11.0
black==24.2.0
packaging==23.2
pre-commit~=3.6
PyGithub~=2.1
PyGithub~=2.2
pyupgrade~=3.15
yamllint~=1.33
6 changes: 4 additions & 2 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
-r requirements.txt
async-timeout
asynctest~=0.13
flake8~=6.1
colorlog~=6.7
flake8~=7.0
flake8-docstrings~=1.7
mypy==1.7.0
mypy==1.8.0
pylint~=3.0
pylint-strict-informational==0.1
pytest>=7.2
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
homeassistant>=2023.1.0
pip>=21.0,<23.4
homeassistant>=2023.8.0
pip>=21.0,<23.2
4 changes: 4 additions & 0 deletions scripts/update
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ cd "${ROOT}"

if git branch -r | grep -q "blueprint/dev" ; then
git fetch blueprint dev
elif git branch -r | grep -q "blueprint/develop" ; then
git fetch blueprint develop
elif git branch -r | grep -q "blueprint/master" ; then
git fetch blueprint master
elif git branch -r | grep -q "blueprint/main" ; then
git fetch blueprint main
fi

git fetch
Expand Down

0 comments on commit c010bb2

Please sign in to comment.