diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 267144b82af3..dcd6098b071a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,10 +2,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3.13 COPY --from=ghcr.io/astral-sh/uv:0.5.11 /uv /uvx /bin/ ARG USERNAME=vscode -RUN curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg && \ - install -o root -g root -m 644 conda.gpg /usr/share/keyrings/conda-archive-keyring.gpg && \ - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" | sudo tee -a /etc/apt/sources.list.d/conda.list - RUN apt-get update && \ apt-get install -y --no-install-recommends libgdal-dev && \ rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1ef372004f49..7b7d11ff2d06 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,17 @@ { - "build": { "dockerfile": "Dockerfile", "context": ".." }, + "build": { + "dockerfile": "Dockerfile", + "context": ".." + }, "containerUser": "vscode", "remoteUser": "vscode", "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", "workspaceFolder": "/app", "customizations": { "codespaces": { - "openFiles": ["docs/tutorials/getting_started.qmd"] + "openFiles": [ + "docs/tutorials/getting_started.qmd" + ] }, "vscode": { "extensions": [ @@ -29,4 +34,4 @@ "yqVersion": "latest" } } -} +} \ No newline at end of file diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index c7106b57a7d7..4e1654f480b5 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -3,8 +3,8 @@ source /opt/conda/etc/profile.d/conda.sh # install ibis -python3 -m pip install ipyflow ipython +python3 -m pip install ipython # avoid using dynamic versioning by grabbing the version from pyproject.toml POETRY_DYNAMIC_VERSIONING_BYPASS="$(yq '.tool.poetry.version' pyproject.toml)" \ - python3 -m pip install -e '.[clickhouse,datafusion,duckdb,examples]' + python3 -m pip install -e '.[duckdb,clickhouse,examples,geospatial,datafusion]'