Update devcontainer, deps

rroller · rroller · commit 09729d1704df · 2024-06-08T11:05:12.000-07:00
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -0,0 +1,43 @@
+{
+    "name": "ludeeus/integration_blueprint",
+    "image": "mcr.microsoft.com/devcontainers/python:3.12-bullseye",
+    "postCreateCommand": "scripts/setup",
+    "forwardPorts": [
+        8123
+    ],
+    "portsAttributes": {
+        "8123": {
+            "label": "Home Assistant",
+            "onAutoForward": "notify"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "github.vscode-pull-request-github",
+                "ryanluker.vscode-coverage-gutters",
+                "ms-python.vscode-pylance"
+            ],
+            "settings": {
+                "files.eol": "\n",
+                "editor.tabSize": 4,
+                "python.pythonPath": "/usr/bin/python3",
+                "python.analysis.autoSearchPaths": false,
+                "python.linting.pylintEnabled": true,
+                "python.linting.enabled": true,
+                "python.formatting.provider": "black",
+                "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+                "editor.formatOnPaste": false,
+                "editor.formatOnSave": true,
+                "editor.formatOnType": true,
+                "files.trimTrailingWhitespace": true,
+                "terminal.integrated.shell.linux": "bash"
+            }
+        }
+    },
+    "remoteUser": "vscode",
+    "features": {
+        "ghcr.io/devcontainers/features/rust:1": {}
+    }
+}
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-* text=auto eol=lf
+* text=auto eol=lf
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,21 @@
+# artifacts
 __pycache__
-pythonenv*
-venv
-.venv
+.pytest*
+*.egg-info
+*/build/*
+*/dist/*
+
+
+# misc
 .coverage
-.idea/
+.vscode
+coverage.xml
+.idea
+
+
+# Home Assistant configuration
+config/*
+config/home-assistant.log
+config/home-assistant_v2.db-shm
+config/home-assistant_v2.db-wal
+!config/configuration.yaml
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -24,6 +24,12 @@
             "type": "shell",
             "command": "container set-version",
             "problemMatcher": []
+        },
+        {
+            "label": "Run Home Assistant on port 8123",
+            "type": "shell",
+            "command": "scripts/develop",
+            "problemMatcher": []
         }
     ]
 }
diff --git a/config/configuration.yaml b/config/configuration.yaml
diff --git a/custom_components/dahua/translations/fr.json b/custom_components/dahua/translations/fr.json
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,2 @@
-homeassistant~=2024.1.0
-ha-ffmpeg==3.0.2
-voluptuous~=0.12.1
-aiohttp~=3.7.4.post0
-yarl~=1.6.3
-requests~=2.25.1
+homeassistant~=2024.6.0
+ha-ffmpeg==3.2.0
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1 +1 @@
-pytest-homeassistant-custom-component==0.3.0
+pytest-homeassistant-custom-component==0.13.133
diff --git a/scripts/develop b/scripts/develop
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+# Create config dir if not present
+if [[ ! -d "${PWD}/config" ]]; then
+    mkdir -p "${PWD}/config"
+    hass --config "${PWD}/config" --script ensure_config
+fi
+
+# Set the path to custom_components
+## This let's us have the structure we want <root>/custom_components/integration_blueprint
+## while at the same time have Home Assistant configuration inside <root>/config
+## without resulting to symlinks.
+export PYTHONPATH="${PYTHONPATH}:${PWD}/custom_components"
+
+# Start Home Assistant
+hass --config "${PWD}/config" --debug
diff --git a/scripts/lint b/scripts/lint
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+ruff check . --fix
diff --git a/scripts/setup b/scripts/setup
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+python3 -m pip install --requirement requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* text=auto eol=lf`
	`1`	`+* text=auto eol=lf`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,12 @@`
`24`	`24`	`"type": "shell",`
`25`	`25`	`"command": "container set-version",`
`26`	`26`	`"problemMatcher": []`
	`27`	`+ },`
	`28`	`+ {`
	`29`	`+ "label": "Run Home Assistant on port 8123",`
	`30`	`+ "type": "shell",`
	`31`	`+ "command": "scripts/develop",`
	`32`	`+ "problemMatcher": []`
`27`	`33`	`}`
`28`	`34`	`]`
`29`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-pytest-homeassistant-custom-component==0.3.0`
	`1`	`+pytest-homeassistant-custom-component==0.13.133`