From 4da79c0a09b94a773d6881e7c8bf07db3121b68c Mon Sep 17 00:00:00 2001 From: lesh Date: Thu, 22 May 2025 10:33:50 +0300 Subject: [PATCH 1/3] feat(env): devcontainer-ruff implementation --- .devcontainer/devcontainer.json | 17 +++++++++++++++-- pyproject.toml | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 91e5303fd0..82040ed82b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,6 @@ { "name": "dimos-dev", - "image": "ghcr.io/dimensionalos/dimos-dev:latest", - "postCreateCommand": "pre-commit install", + "image": "ghcr.io/dimensionalos/dev:dev", "customizations": { "vscode": { "extensions": [ @@ -9,5 +8,19 @@ "ms-python.vscode-pylance" ] } + }, + + "settings": { + "notebook.formatOnSave.enabled": true, + "notebook.codeActionsOnSave": { + "notebook.source.fixAll": "explicit", + "notebook.source.organizeImports": "explicit" + }, + "editor.codeActionsOnSave": { + "source.fixAll": "explicit", + "source.organizeImports": "explicit" + }, + "editor.defaultFormatter": "charliermarsh.ruff", + "editor.formatOnSave": true } } diff --git a/pyproject.toml b/pyproject.toml index 1ffe5399bc..6d6dd776dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,23 @@ description = "Powering agentive generalist robotics" [tool.ruff] line-length = 120 +exclude = [ + ".git", + ".pytest_cache", + ".ruff_cache", + ".venv", + ".vscode", + "__pypackages__", + "_build", + "build", + "dist", + "node_modules", + "site-packages", + "venv", + "libs", + "external", + "src" +] [tool.pytest.ini_options] testpaths = ["dimos/robot"] From 0c7a603343f32a1c14dfb514ff666204483fc265 Mon Sep 17 00:00:00 2001 From: lesh Date: Thu, 22 May 2025 12:06:39 +0300 Subject: [PATCH 2/3] including mypy and ruff in the dev image --- docker/dev/Dockerfile | 3 +++ docker/dev/dev-requirements.txt | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 docker/dev/dev-requirements.txt diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 058221cfe1..73c3dab780 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -15,6 +15,9 @@ RUN apt-get install -y \ iputils-ping \ wget +COPY docker/dev/dev-requirements.txt /app/ +RUN --mount=type=cache,target=/root/.cache/pip pip install -r dev-requirements.txt + # Copy files and add version to motd COPY motd /etc/motd COPY /docker/dev/bash.sh /root/.bash.sh diff --git a/docker/dev/dev-requirements.txt b/docker/dev/dev-requirements.txt new file mode 100644 index 0000000000..bf541fe5ae --- /dev/null +++ b/docker/dev/dev-requirements.txt @@ -0,0 +1,3 @@ +ruff 0.11.10 +mypy 1.15.0 +mypy_extensions 1.1.0 From c99adbc17a3d2d4b5347993dd1d26562827e1595 Mon Sep 17 00:00:00 2001 From: lesh Date: Thu, 22 May 2025 12:20:01 +0300 Subject: [PATCH 3/3] fixed dev-requirements syntax --- docker/dev/dev-requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/dev/dev-requirements.txt b/docker/dev/dev-requirements.txt index bf541fe5ae..965af4cc9d 100644 --- a/docker/dev/dev-requirements.txt +++ b/docker/dev/dev-requirements.txt @@ -1,3 +1,2 @@ -ruff 0.11.10 -mypy 1.15.0 -mypy_extensions 1.1.0 +ruff==0.11.10 +mypy==1.15.0