From 2baa42d8b61905e25848b127e4540acc000beea5 Mon Sep 17 00:00:00 2001
From: Sander <developer@golles.nl>
Date: Sun, 17 Mar 2024 21:50:50 +0000
Subject: [PATCH] Allow running in codespaces

---
 .devcontainer/configuration.yaml | 6 ++++++
 .devcontainer/devcontainer.json  | 1 +
 .github/workflows/ci.yaml        | 4 ++--
 requirements.txt                 | 5 +----
 requirements_dev.txt             | 5 +++++
 requirements_test.txt            | 1 -
 scripts/setup                    | 2 +-
 scripts/update                   | 7 ++-----
 8 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 requirements_dev.txt
 delete mode 100644 requirements_test.txt

diff --git a/.devcontainer/configuration.yaml b/.devcontainer/configuration.yaml
index b4962a9..89122ca 100644
--- a/.devcontainer/configuration.yaml
+++ b/.devcontainer/configuration.yaml
@@ -1,5 +1,11 @@
 default_config:
 
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    - 127.0.0.1
+    - ::1
+
 logger:
   default: info
   logs:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 71bb295..1b222e6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,6 +22,7 @@
         "files.eol": "\n",
         "editor.tabSize": 4,
         "python.analysis.autoSearchPaths": false,
+        "python.experiments.optOutFrom": ["pythonTestAdapter"],
         "python.formatting.provider": "black",
         "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
         "editor.formatOnPaste": false,
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6156cc6..178c2d4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,7 +32,7 @@ jobs:
       - name: Check code formatting with isort
         uses: isort/isort-action@master
         with:
-          requirementsFiles: "requirements.txt requirements_test.txt"
+          requirementsFiles: "requirements.txt requirements_dev.txt"
 
   tests:
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
       - name: Install requirements
         run: |
           python3 -m pip install -r requirements.txt
-          python3 -m pip install -r requirements_test.txt
+          python3 -m pip install -r requirements_dev.txt
 
       - name: Run tests
         run: |
diff --git a/requirements.txt b/requirements.txt
index d87ac78..7144b41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,2 @@
-pip>=21.0,<24.1
-colorlog
-isort
-homeassistant
+homeassistant>=2023.6.0
 pyserial==3.5
diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644
index 0000000..f5c3a3e
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+pip>=21.0,<24.1
+colorlog
+isort
+pytest-homeassistant-custom-component
diff --git a/requirements_test.txt b/requirements_test.txt
deleted file mode 100644
index 71f5999..0000000
--- a/requirements_test.txt
+++ /dev/null
@@ -1 +0,0 @@
-pytest-homeassistant-custom-component
diff --git a/scripts/setup b/scripts/setup
index 141d19f..21695d0 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -4,4 +4,4 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-python3 -m pip install --requirement requirements.txt
+python3 -m pip install --requirement requirements_dev.txt
diff --git a/scripts/update b/scripts/update
index bb8b892..8f479c6 100755
--- a/scripts/update
+++ b/scripts/update
@@ -4,9 +4,6 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-python3 -m pip install --upgrade --force-reinstall --requirement requirements.txt
+sudo apt update && sudo apt -y upgrade
 
-if python -c "import pytest_homeassistant_custom_component" &> /dev/null; then
-    # User also has test requirements, update those as well.
-    python3 -m pip install --upgrade --force-reinstall --requirement requirements_test.txt
-fi
+python3 -m pip install --upgrade --force-reinstall --requirement requirements_dev.txt