From 43a7a2bb4fe7af9785e3da46f0929b622a0d32fd Mon Sep 17 00:00:00 2001 From: Andrew Cockburn Date: Thu, 6 Feb 2025 14:53:13 +0000 Subject: [PATCH] VSCode stuff --- .devcontainer/{app_dir_testing => }/Dockerfile | 2 +- .devcontainer/app_dir_testing/devcontainer.json | 2 +- .devcontainer/dev/Dockerfile | 16 ---------------- .devcontainer/dev/devcontainer.json | 2 +- docs/INSTALL.rst | 2 +- 5 files changed, 4 insertions(+), 20 deletions(-) rename .devcontainer/{app_dir_testing => }/Dockerfile (93%) delete mode 100644 .devcontainer/dev/Dockerfile diff --git a/.devcontainer/app_dir_testing/Dockerfile b/.devcontainer/Dockerfile similarity index 93% rename from .devcontainer/app_dir_testing/Dockerfile rename to .devcontainer/Dockerfile index 00c56824f..d87283e95 100644 --- a/.devcontainer/app_dir_testing/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_RELEASE=3.12 +ARG PYTHON_RELEASE=3.13 ARG BASE_IMAGE=python:${PYTHON_RELEASE} # Runtime image FROM ${BASE_IMAGE} diff --git a/.devcontainer/app_dir_testing/devcontainer.json b/.devcontainer/app_dir_testing/devcontainer.json index aed75239e..85a02817b 100644 --- a/.devcontainer/app_dir_testing/devcontainer.json +++ b/.devcontainer/app_dir_testing/devcontainer.json @@ -6,7 +6,7 @@ // Sets the run context to one level up instead of the .devcontainer folder. "context": "../..", // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. - "dockerfile": "Dockerfile", + "dockerfile": "../Dockerfile", "args": { "PYTHON_RELEASE": "3.12" // This overrides the default of 3.13 } diff --git a/.devcontainer/dev/Dockerfile b/.devcontainer/dev/Dockerfile deleted file mode 100644 index 00c56824f..000000000 --- a/.devcontainer/dev/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -ARG PYTHON_RELEASE=3.12 -ARG BASE_IMAGE=python:${PYTHON_RELEASE} -# Runtime image -FROM ${BASE_IMAGE} - -# Copy Repo across -COPY . /usr/src/appdaemon/ - -# Install AD Dependencies -RUN pip install -r /usr/src/appdaemon/requirements.txt - -# Add dev dependencies -RUN pip install -r /usr/src/appdaemon/dev-requirements.txt - -# Add doc dependencies -RUN pip install -r /usr/src/appdaemon/doc-requirements.txt diff --git a/.devcontainer/dev/devcontainer.json b/.devcontainer/dev/devcontainer.json index 2a705e58d..3c636abbb 100644 --- a/.devcontainer/dev/devcontainer.json +++ b/.devcontainer/dev/devcontainer.json @@ -6,7 +6,7 @@ // Sets the run context to one level up instead of the .devcontainer folder. "context": "../..", // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. - "dockerfile": "Dockerfile", + "dockerfile": "../Dockerfile", "args": { "PYTHON_RELEASE": "3.12" // This overrides the default of 3.13 } diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst index e6f6fd6e9..2641f7a2c 100644 --- a/docs/INSTALL.rst +++ b/docs/INSTALL.rst @@ -91,7 +91,7 @@ Pip Linux ^^^^^ -**Requirements**: Python version `3.8`, `3.9`, `3.10` or `3.11`. +**Requirements**: Python version `3.10` or `3.11`. **NOTE:** Do not install this in the same Python virtual environment as Home Assistant. If you do that, then Home Assistant will stop working due to conflicting dependencies.