Compare to main

.coveragerc

@@ -1,5 +1,5 @@
 [run]
-branch = True
+branch = False
 source = custom_components/ocpp
 
 [report]

.devcontainer/devcontainer.json

@@ -1,28 +1,80 @@
-// See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-  "image": "ludeeus/container:integration-debian",
-  "name": "OCPP integration development",
-  "context": "..",
-  "appPort": ["9123:8123", "9000:9000"],
-  "postCreateCommand": "container install",
-  "extensions": [
-    "ms-python.python",
-    "github.vscode-pull-request-github",
-    "ryanluker.vscode-coverage-gutters",
-    "ms-python.vscode-pylance"
-  ],
-  "settings": {
-    "files.eol": "\n",
-    "editor.tabSize": 4,
-    "terminal.integrated.shell.linux": "/bin/bash",
-    "python.pythonPath": "/usr/bin/python3",
-    "python.analysis.autoSearchPaths": false,
-    "python.linting.pylintEnabled": true,
-    "python.linting.enabled": true,
-    "python.formatting.provider": "black",
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "files.trimTrailingWhitespace": true
-  }
-}
+    "name": "Home Assistant Dev",
+    "context": "..",
+    "dockerFile": "../Dockerfile.dev",
+    "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && scripts/setup",
+    "postStartCommand": "scripts/bootstrap",
+    "containerEnv": {
+        "PYTHONASYNCIODEBUG": "1"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/github-cli:1": {}
+    },
+    "appPort": [
+        "9000:9000", // OCPP
+        "8123:8123", // Home Assistant
+        "5683:5683/udp" // Shelly integration
+    ],
+    "runArgs": [
+        "-e",
+        "GIT_EDITOR=code --wait",
+        "--security-opt",
+        "label=disable"
+    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "charliermarsh.ruff",
+                "ms-python.pylint",
+                "ms-python.vscode-pylance",
+                "visualstudioexptteam.vscodeintellicode",
+                "redhat.vscode-yaml",
+                "esbenp.prettier-vscode",
+                "GitHub.vscode-pull-request-github",
+                "GitHub.copilot"
+            ],
+            // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
+            "settings": {
+                "python.experiments.optOutFrom": [
+                    "pythonTestAdapter"
+                ],
+                "python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
+                "python.pythonPath": "/home/vscode/.local/ha-venv/bin/python",
+                "python.terminal.activateEnvInCurrentTerminal": true,
+                "python.testing.pytestArgs": [
+                    "--no-cov"
+                ],
+                "pylint.importStrategy": "fromEnvironment",
+                "editor.formatOnPaste": false,
+                "editor.formatOnSave": true,
+                "editor.formatOnType": true,
+                "files.trimTrailingWhitespace": true,
+                "terminal.integrated.profiles.linux": {
+                    "zsh": {
+                        "path": "/usr/bin/zsh"
+                    }
+                },
+                "terminal.integrated.defaultProfile.linux": "zsh",
+                "yaml.customTags": [
+                    "!input scalar",
+                    "!secret scalar",
+                    "!include_dir_named scalar",
+                    "!include_dir_list scalar",
+                    "!include_dir_merge_list scalar",
+                    "!include_dir_merge_named scalar"
+                ],
+                "[python]": {
+                    "editor.defaultFormatter": "charliermarsh.ruff"
+                },
+                "json.schemas": [
+                    {
+                        "fileMatch": [
+                            "homeassistant/components/*/manifest.json"
+                        ],
+                        "url": "${containerWorkspaceFolder}/scripts/json_schemas/manifest_schema.json"
+                    }
+                ]
+            }
+        }
+    }
+}

.github/workflows/labeler.yml

@@ -1,20 +1,20 @@
-name: Manage labels
-
-on:
-  push:
-    branches:
-      - main
-      - master
-
-jobs:
-  labeler:
-    name: Labeler
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@v3
-
-      - name: Run Labeler
-        uses: crazy-max/ghaction-github-labeler@v4.1.0
-        with:
-          skip-delete: true
+name: Manage labels
+
+on:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  labeler:
+    name: Labeler
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v5
+
+      - name: Run Labeler
+        uses: crazy-max/ghaction-github-labeler@v6.0.0
+        with:
+          skip-delete: true

.github/workflows/publish.yml

@@ -1,52 +1,52 @@
-name: Publish
-
-on:
-  release:
-    types:
-      - published
-  push:
-    branches:
-      - main
-
-jobs:
-  release_zip_file:
-    name: Publish zip file asset
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@v3
-
-      - name: 🛠️ Set up Python
-        uses: actions/setup-python@v4.7.0
-        with:
-          python-version: "3.x"
-
-      - name: 🔢 Get version
-        id: version
-        uses: home-assistant/actions/helpers/version@master
-
-      - name: 🔢 Set version number
-        run: |
-          python3 ${{ github.workspace }}/manage/update_manifest.py --version ${{ steps.version.outputs.version }}
-
-      - name: 📤 Upload zip to action
-        uses: actions/upload-artifact@v3.1.2
-        if: ${{ github.event_name == 'push' }}
-        with:
-          name: ocpp
-          path: ${{ github.workspace }}/custom_components/ocpp
-
-      # Pack the dir as a zip and upload to the release
-      - name: 📦 ZIP Dir
-        if: ${{ github.event_name == 'release' }}
-        run: |
-          cd ${{ github.workspace }}/custom_components/ocpp
-          zip ocpp.zip -r ./
-
-      - name: 📤 Upload zip to release
-        uses: softprops/action-gh-release@v1
-        if: ${{ github.event_name == 'release' }}
-        with:
+name: Publish
+
+on:
+  release:
+    types:
+      - published
+  push:
+    branches:
+      - main
+
+jobs:
+  release_zip_file:
+    name: Publish zip file asset
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: 📥 Checkout the repository
+        uses: actions/checkout@v5
+
+      - name: 🛠️ Set up Python
+        uses: actions/setup-python@v6.2.0
+        with:
+          python-version: "3.x"
+
+      - name: 🔢 Get version
+        id: version
+        uses: home-assistant/actions/helpers/version@master
+
+      - name: 🔢 Set version number
+        run: |
+          python3 ${{ github.workspace }}/manage/update_manifest.py --version ${{ steps.version.outputs.version }}
+
+      - name: 📤 Upload zip to action
+        uses: actions/upload-artifact@v7.0.1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          name: ocpp
+          path: ${{ github.workspace }}/custom_components/ocpp
+
+      # Pack the dir as a zip and upload to the release
+      - name: 📦 ZIP Dir
+        if: ${{ github.event_name == 'release' }}
+        run: |
+          cd ${{ github.workspace }}/custom_components/ocpp
+          zip ocpp.zip -r ./
+
+      - name: 📤 Upload zip to release
+        uses: softprops/action-gh-release@v3
+        if: ${{ github.event_name == 'release' }}
+        with:
           files: ${{ github.workspace }}/custom_components/ocpp/ocpp.zip

.github/workflows/publish_docs_to_wiki.yml

@@ -1,38 +1,38 @@
-name: Publish docs to Wiki
-
-on:
-  push:
-    paths:
-      - docs/**
-    branches:
-      - main
-
-env:
-  USER_TOKEN: ${{ secrets.WIKI_ACTION_TOKEN }}
-  USER_NAME: ocpp
-  USER_EMAIL: ocpp@lbbrhzn.nl
-  OWNER: ${{ github.event.repository.owner.name }}
-  REPOSITORY_NAME: ${{ github.event.repository.name }}
-
-jobs:
-  publish_docs_to_wiki:
-    runs-on: ubuntu-latest
-    steps:  
-    - uses: actions/checkout@v3
-
-    - name: Pull wiki
-      run: |
-         mkdir tmp_wiki
-         cd tmp_wiki
-         git init
-         git config user.name $USER_NAME
-         git config user.email $USER_EMAIL
-         git pull https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git
-
-    - name: Push wiki
-      run: |
-        rsync -av --delete docs/ tmp_wiki/ --exclude .git
-        cd tmp_wiki
-        git add .
-        git commit -m "Update Wiki content"
-        git push -f --set-upstream https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git master
+name: Publish docs to Wiki
+
+on:
+  push:
+    paths:
+      - docs/**
+    branches:
+      - main
+      
+env:
+  USER_TOKEN: ${{ secrets.WIKI_ACTION_TOKEN }}
+  USER_NAME: ocpp
+  USER_EMAIL: ocpp@lbbrhzn.nl
+  OWNER: ${{ github.event.repository.owner.name }}
+  REPOSITORY_NAME: ${{ github.event.repository.name }}
+
+jobs:
+  publish_docs_to_wiki:
+    runs-on: ubuntu-latest
+    steps:  
+    - uses: actions/checkout@v5
+
+    - name: Pull wiki
+      run: |
+         mkdir tmp_wiki
+         cd tmp_wiki
+         git init
+         git config user.name $USER_NAME
+         git config user.email $USER_EMAIL
+         git pull https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git
+
+    - name: Push wiki
+      run: |
+        rsync -av --delete docs/ tmp_wiki/ --exclude .git
+        cd tmp_wiki
+        git add .
+        git commit -m "Update Wiki content"
+        git push -f --set-upstream https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git master

.github/workflows/rebase-pull-requests.txt

@@ -1,9 +1,9 @@
-name: Rebase Pull Requests
-on:
-  push:
-    branches: '**'
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-    steps:
+name: Rebase Pull Requests
+on:
+  push:
+    branches: '**'
+jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    steps:
       - uses: linhbn123/rebase-pull-requests@v1.0.1