diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9fff519..55609d8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,7 +23,7 @@ "ms-python.mypy-type-checker", "ms-python.python", "henriiik.vscode-ruff", - "charliermarsh.ruff", + "charliermarsh.ruff-vscode", "ryanluker.vscode-coverage-gutters", "tamasfe.even-better-toml", "visualstudioexptteam.vscodeintellicode", diff --git a/Dockerfile b/Dockerfile index 4c015b1..6b175b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,12 @@ RUN sh -c "$(curl -fsSL https://starship.rs/install.sh)" -- "--yes" && \ # && echo 'poe --help' >> ~/.zshrc \ && zsh -c 'source ~/.zshrc' +# Copy poetry and project configuration files to the container +COPY poetry.lock* pyproject.toml /workspaces/vespadb/ + +# Install the project dependencies - make sure to use the virtual environment +RUN poetry install --no-root --no-interaction --no-ansi + CMD ["zsh"] FROM base AS app diff --git a/poetry.lock b/poetry.lock index fbed430..dce7534 100644 --- a/poetry.lock +++ b/poetry.lock @@ -947,13 +947,13 @@ tests = ["pytest"] [[package]] name = "pydantic" -version = "2.6.2" +version = "2.6.3" description = "Data validation using Python type hints" optional = false python-versions = ">=3.8" files = [ - {file = "pydantic-2.6.2-py3-none-any.whl", hash = "sha256:37a5432e54b12fecaa1049c5195f3d860a10e01bdfd24f1840ef14bd0d3aeab3"}, - {file = "pydantic-2.6.2.tar.gz", hash = "sha256:a09be1c3d28f3abe37f8a78af58284b236a92ce520105ddc91a6d29ea1176ba7"}, + {file = "pydantic-2.6.3-py3-none-any.whl", hash = "sha256:72c6034df47f46ccdf81869fddb81aade68056003900a8724a4f160700016a2a"}, + {file = "pydantic-2.6.3.tar.gz", hash = "sha256:e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f"}, ] [package.dependencies] @@ -1564,4 +1564,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = ">=3.11.6,<4.0" -content-hash = "178c6df0d8c22642194ce528d235c424387e4c7ad778bc7cb2180d05e32fb97d" +content-hash = "8963161d0a571dcc2bc9170cb58a17c53d53eb98bf64fd7c1616ba4d0ef46575" diff --git a/pyproject.toml b/pyproject.toml index 31dccff..9ca31cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ psycopg2 = "^2.9.9" ipython = "^8.22.1" drf-yasg = "^1.21.7" djangorestframework-gis = "^1.0" -ruff = "^0.2.2" +pre-commit = "^3.6.2" [tool.poetry.group.dev.dependencies] # https://python-poetry.org/docs/master/managing-dependencies/ coverage = { extras = ["toml"], version = ">=7.4.1" } @@ -33,10 +33,10 @@ pre-commit = ">=3.6.2" pytest = ">=8.0.1" pytest-clarity = ">=1.0.1" pytest-mock = ">=3.12.0" -ruff = ">=0.2.2" safety = ">=2.3.5,!=2.3.5" shellcheck-py = ">=0.9.0" typeguard = ">=4.1.5" +ruff = "^0.2.2" [[tool.poetry.source]] # https://python-poetry.org/docs/repositories/ name = "pypi"