From 53c51c92212cde7496b0af87dce48d39593a706d Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Fri, 7 Oct 2022 01:16:38 +0200 Subject: [PATCH] Uninstall pre-installed tools from devcontainer (#79765) --- .devcontainer/devcontainer.json | 8 +++++++- Dockerfile.dev | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ba2911dcf0c304..fe0d53a92efc54 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -17,8 +17,14 @@ // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json "settings": { "python.pythonPath": "/usr/local/bin/python", - "python.linting.pylintEnabled": true, "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + "python.formatting.blackPath": "/usr/local/bin/black", + "python.linting.flake8Path": "/usr/local/bin/flake8", + "python.linting.pycodestylePath": "/usr/local/bin/pycodestyle", + "python.linting.pydocstylePath": "/usr/local/bin/pydocstyle", + "python.linting.mypyPath": "/usr/local/bin/mypy", + "python.linting.pylintPath": "/usr/local/bin/pylint", "python.formatting.provider": "black", "python.testing.pytestArgs": ["--no-cov"], "editor.formatOnPaste": false, diff --git a/Dockerfile.dev b/Dockerfile.dev index 0559ebb43cd1df..fc9843461a03f5 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -2,6 +2,15 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.9 SHELL ["/bin/bash", "-o", "pipefail", "-c"] +# Uninstall pre-installed formatting and linting tools +# They would conflict with our pinned versions +RUN pipx uninstall black +RUN pipx uninstall flake8 +RUN pipx uninstall pydocstyle +RUN pipx uninstall pycodestyle +RUN pipx uninstall mypy +RUN pipx uninstall pylint + RUN \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && apt-get update \