diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index 3990d7b9e8..5cf97a545a 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -53,7 +53,7 @@ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian. # RUN python3 -m pip install --upgrade pip -RUN python3 -m pip install debugpy typing_extensions psutil +RUN python3 -m pip install debugpy ################################################################ # End section generated from template/Dockerfile.full.header @@ -87,7 +87,7 @@ RUN add-apt-repository -y ppa:deadsnakes/ppa && \ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # RUN python3.9 -m pip install --upgrade pip -RUN python3.9 -m pip install debugpy typing_extensions psutil +RUN python3.9 -m pip install debugpy # Coral Edge TPU # https://coral.ai/docs/accelerator/get-started/#runtime-on-linux diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer index 444eb60711..16abbc336e 100644 --- a/install/docker/template/Dockerfile.full.footer +++ b/install/docker/template/Dockerfile.full.footer @@ -27,7 +27,7 @@ RUN add-apt-repository -y ppa:deadsnakes/ppa && \ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # RUN python3.9 -m pip install --upgrade pip -RUN python3.9 -m pip install debugpy typing_extensions psutil +RUN python3.9 -m pip install debugpy # Coral Edge TPU # https://coral.ai/docs/accelerator/get-started/#runtime-on-linux diff --git a/install/docker/template/Dockerfile.full.header b/install/docker/template/Dockerfile.full.header index 239e06dca4..da1ad3d3c1 100644 --- a/install/docker/template/Dockerfile.full.header +++ b/install/docker/template/Dockerfile.full.header @@ -50,7 +50,7 @@ RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED # ERROR: Cannot uninstall pip 24.0, RECORD file not found. Hint: The package was installed by debian. # RUN python3 -m pip install --upgrade pip -RUN python3 -m pip install debugpy typing_extensions psutil +RUN python3 -m pip install debugpy ################################################################ # End section generated from template/Dockerfile.full.header diff --git a/install/local/install-scrypted-dependencies-mac.sh b/install/local/install-scrypted-dependencies-mac.sh index 991ac6a256..6d6b392211 100755 --- a/install/local/install-scrypted-dependencies-mac.sh +++ b/install/local/install-scrypted-dependencies-mac.sh @@ -70,7 +70,7 @@ fi RUN python$PYTHON_VERSION -m pip install --upgrade pip # besides debugpy, none of these dependencies are needed anymore? -# newer macos installs python3.9 which includings typing and does not need typing_extensions. +# portable python includes typing and does not need typing_extensions. # opencv-python-headless has wheels for macos. if [ "$PYTHON_VERSION" != "3.10" ] then diff --git a/install/local/install-scrypted-dependencies-win.ps1 b/install/local/install-scrypted-dependencies-win.ps1 index eabbc59832..2848c07648 100644 --- a/install/local/install-scrypted-dependencies-win.ps1 +++ b/install/local/install-scrypted-dependencies-win.ps1 @@ -30,6 +30,9 @@ $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" npm i -g npm py $SCRYPTED_WINDOWS_PYTHON_VERSION -m pip install --upgrade pip +# besides debugpy, none of these dependencies are needed anymore? +# portable python includes typing and does not need typing_extensions. +# opencv-python-headless has wheels for windows. py $SCRYPTED_WINDOWS_PYTHON_VERSION -m pip install debugpy typing_extensions typing opencv-python $SCRYPTED_INSTALL_VERSION=[System.Environment]::GetEnvironmentVariable("SCRYPTED_INSTALL_VERSION","User")