diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 71a5c07..76aa698 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,21 +5,21 @@ "features": { "ghcr.io/devcontainers/features/git:1": {}, }, - "postCreateCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/postcreate.zsh", - "postStartCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/poststart.zsh", + "postCreateCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-create.zsh", + "postStartCommand": "zsh /workspaces/DevContainer/.devcontainer/scripts/post-start.zsh", "customizations": { "vscode": { "extensions": [ - "ms-python.black-formatter", "ms-python.python", - "ms-python.isort", - "ms-toolsai.jupyter", - "ms-azuretools.vscode-docker", - "ms-vscode-remote.remote-containers", "streetsidesoftware.code-spell-checker", "charliermarsh.ruff", "njpwerner.autodocstring", "tamasfe.even-better-toml", + "ms-python.black-formatter", + "ms-python.isort", + "ms-toolsai.jupyter", + "ms-azuretools.vscode-docker", + "ms-vscode-remote.remote-containers", "p403n1x87.austin-vscode" ] } diff --git a/.devcontainer/dockerfile b/.devcontainer/dockerfile index 996408a..fb8fc63 100755 --- a/.devcontainer/dockerfile +++ b/.devcontainer/dockerfile @@ -3,7 +3,9 @@ FROM mcr.microsoft.com/devcontainers/python:3.12 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y git git-lfs austin --no-install-recommends + apt-get install -y --no-install-recommends \ + git git-lfs austin graphviz graphviz-dev libboost-all-dev libilmbase-dev \ + libopenexr-dev libpng-dev libtiff5-dev RUN apt-get autoremove -y && \ apt-get clean -y && \ diff --git a/.devcontainer/scripts/postcreate.zsh b/.devcontainer/scripts/post-create.zsh similarity index 57% rename from .devcontainer/scripts/postcreate.zsh rename to .devcontainer/scripts/post-create.zsh index 4ef150b..7fc6d3b 100755 --- a/.devcontainer/scripts/postcreate.zsh +++ b/.devcontainer/scripts/post-create.zsh @@ -5,7 +5,8 @@ cd /workspaces/DevContainer # https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/ # https://github.com/microsoft/vscode-remote-release/issues/7923 -git config --global --add safe.directory . +git config --global --add safe.directory /workspaces/DevContainer git submodule update --init -poetry install \ No newline at end of file +poetry install +poetry run python -c "import imageio;imageio.plugins.freeimage.download()" \ No newline at end of file diff --git a/.devcontainer/scripts/post-start.zsh b/.devcontainer/scripts/post-start.zsh new file mode 100755 index 0000000..3a5e611 --- /dev/null +++ b/.devcontainer/scripts/post-start.zsh @@ -0,0 +1,8 @@ +#!zsh +git config --global --add safe.directory /workspaces/DevContainer +git config --global --add safe.directory /workspaces/DevContainer/** + +poetry install + +git fetch +git status -sb -uno \ No newline at end of file diff --git a/.devcontainer/scripts/poststart.zsh b/.devcontainer/scripts/poststart.zsh deleted file mode 100755 index 24389b4..0000000 --- a/.devcontainer/scripts/poststart.zsh +++ /dev/null @@ -1,6 +0,0 @@ -#!zsh - -poetry install - -git fetch -git status -sb -uno \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 1cfc2db..f478697 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -41,7 +41,6 @@ "whitepoint" ], "[python]": { - "editor.formatOnType": true, "editor.defaultFormatter": "ms-python.black-formatter" }, "python.analysis.typeCheckingMode": "basic", @@ -107,5 +106,5 @@ "isort.importStrategy": "fromEnvironment", "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml" - }, + } } \ No newline at end of file