Fix open window mode merge conflicts

.devcontainer/devcontainer.json

@@ -0,0 +1,70 @@
+{
+    "customizations": {
+        "codespaces": {
+            "openFiles": [
+                "README.md",
+                "CONTRIBUTING.md"
+            ]
+        },
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "redhat.vscode-yaml",
+                "esbenp.prettier-vscode",
+                "GitHub.vscode-pull-request-github",
+                "charliermarsh.ruff",
+                "GitHub.vscode-github-actions",
+                "ryanluker.vscode-coverage-gutters"
+            ],
+            "settings": {
+                "[python]": {
+                    "editor.codeActionsOnSave": {
+                        "source.fixAll": "always",
+                        "source.organizeImports": "always"
+                    }
+                },
+                "coverage-gutters.customizable.context-menu": true,
+                "coverage-gutters.customizable.status-bar-toggler-watchCoverageAndVisibleEditors-enabled": true,
+                "coverage-gutters.showGutterCoverage": false,
+                "coverage-gutters.showLineCoverage": true,
+                "coverage-gutters.xmlname": "coverage.xml",
+                "python.analysis.extraPaths": [
+                    "${workspaceFolder}/src"
+                ],
+                "python.defaultInterpreterPath": ".venv/bin/python",
+                "python.formatting.provider": "black",
+                "python.linting.enabled": true,
+                "python.linting.mypyEnabled": true,
+                "python.linting.pylintEnabled": true,
+                "python.testing.cwd": "${workspaceFolder}",
+                "python.testing.pytestArgs": [
+                    "--cov-report=xml"
+                ],
+                "python.testing.pytestEnabled": true,
+                "ruff.importStrategy": "fromEnvironment",
+                "ruff.interpreter": [
+                    ".venv/bin/python"
+                ],
+                "terminal.integrated.defaultProfile.linux": "zsh"
+            }
+        }
+    },
+    "features": {
+        "ghcr.io/devcontainers-contrib/features/poetry:2": {},
+        "ghcr.io/devcontainers/features/github-cli:1": {},
+        "ghcr.io/devcontainers/features/node:1": {},
+        "ghcr.io/devcontainers/features/python:1": {
+            "installTools": false
+        }
+    },
+    "image": "mcr.microsoft.com/vscode/devcontainers/python:3.12",
+    "name": "PyTado",
+    "postStartCommand": "bash scripts/bootstrap",
+    "updateContentCommand": "bash scripts/bootstrap",
+    "containerUser": "vscode",
+    "remoteUser": "vscode",
+    "updateRemoteUserUID": true,
+    "containerEnv": {
+        "HOME": "/home/vscode"
+    }
+}

.envrc

@@ -0,0 +1,4 @@
+export VIRTUAL_ENV=."venv"
+layout python
+
+[[ -f .envrc.private ]] && source_env .envrc.private

.github/workflows/codeql.yml → .github/workflows/codeql-advanced.yml

@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL Advanced"
 
 on:

.github/workflows/pythonpackage.yml → .github/workflows/lint-and-test-matrix.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Lint and test multiple Python versions
 
 on:
   push:
@@ -10,44 +10,58 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  lint:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.11", "3.12"]
-
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -e .
-
+        pip install -e '.[all]'
+
     - name: Lint with black
       uses: psf/black@stable
       with:
         options: "--check --verbose"
         src: "./PyTado"
         use_pyproject: true
-
-    - name: Run Tests with Coverage
+
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.13", "3.12", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e '.[all]'
+
+    - name: Run Tests with coverage
       run: |
-        pip install coverage pytest pytest-cov
-        coverage run -m pytest --maxfail=1 --disable-warnings -q
-        coverage report -m
-        coverage html
-
-    # Optionally upload coverage reports as an artifact.
-    - name: Upload coverage report
-      uses: actions/upload-artifact@v3
+        pytest --cov --junitxml=junit.xml -o junit_family=legacy --cov-branch --cov-report=xml
+
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }}
+      uses: codecov/test-results-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v5
       with:
-        name: coverage-html-report
-        path: coverage_html_report
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pre-commit.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches-ignore:
+      - master
+  pull_request: ~
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e '.[all]'
+
+    - name: Run pre-commit hooks
+      uses: pre-commit/action@v3.0.1

.github/workflows/python-publish.yml → .github/workflows/publish-to-pypi.yml

@@ -1,4 +1,4 @@
-name: Upload Python Package
+name: Build and deploy to pypi
 
 on:
   release:
@@ -20,8 +20,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
       - name: Install pypa/build
         run: >-
           python3 -m

.gitignore

@@ -71,6 +71,12 @@ instance/
 # Sphinx documentation
 docs/_build/
 
+# Ruff cache
+.ruff_cache
+
+# Example dev
+/examples/example_dev.py
+
 # PyBuilder
 .pybuilder/
 target/
@@ -127,6 +133,8 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.envrc.private
+!/.envrc
 
 # Spyder project settings
 .spyderproject
@@ -157,4 +165,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/
+
+.DS_Store
+junit.xml

.pre-commit-config.yaml

@@ -0,0 +1,85 @@
+fail_fast: true
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+    - id: no-commit-to-branch
+      name: "Don't commit to master branch"
+      args: [--branch, master]
+    - id: check-ast
+    - id: check-json
+    - id: check-merge-conflict
+    - id: check-toml
+    - id: check-yaml
+    - id: check-json
+    - id: end-of-file-fixer
+      exclude: custom_components/econnect_metronet/manifest.json
+    - id: mixed-line-ending
+    - id: trailing-whitespace
+
+
+- repo: https://github.com/PyCQA/isort
+  rev: 5.13.2
+  hooks:
+    - id: isort
+      exclude: tests/
+      args: ["--profile", "black"]
+
+- repo: https://github.com/hhatto/autopep8
+  rev: v2.3.1
+  hooks:
+    - id: autopep8
+      exclude: tests/
+      args: [--max-line-length=100, --in-place, --aggressive]
+
+- repo: https://github.com/PyCQA/flake8
+  rev: 7.1.1
+  hooks:
+    - id: flake8
+      exclude: tests/
+      args: [--max-line-length=100]
+
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.19.1
+  hooks:
+    - id: pyupgrade
+
+- repo: https://github.com/PyCQA/bandit
+  rev: '1.8.0'
+  hooks:
+    - id: bandit
+      args: ["-c", "pyproject.toml"]
+      additional_dependencies: ["bandit[toml]"]
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.8.4
+  hooks:
+    - id: ruff
+      exclude: tests/
+      args: [--line-length=100, --fix]
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.14.0
+  hooks:
+    - id: mypy
+      exclude: tests/
+      additional_dependencies: [types-requests]
+
+- repo: local
+  hooks:
+    - id: prettier
+      name: prettier
+      entry: prettier
+      language: system
+      types: [python, json, yaml, markdown]
+
+    - id: pytest
+      name: pytest
+      entry: pytest
+      language: python
+      types: [python]
+      pass_filenames: false
+      always_run: true
+      additional_dependencies: [responses, pytest-mock]

.python-version

@@ -0,0 +1 @@
+3.12

.vscode/extensions.json

@@ -4,4 +4,4 @@
         "github.vscode-github-actions",
         "ms-python.pylint"
     ]
-}
+}

.vscode/settings.json

@@ -9,4 +9,4 @@
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "ansible.python.interpreterPath": "/Volumes/Daten/Projects/PyTado/.venv/bin/python"
-}
+}