From 8b35514f18ee0974de572517ebb5afd2f3dc4427 Mon Sep 17 00:00:00 2001
From: Laurent Sorber <laurent.sorber@gmail.com>
Date: Tue, 11 Jun 2024 14:34:54 +0000
Subject: [PATCH] chore: upgrade scaffolding

---
 .cruft.json                     | 2 +-
 .devcontainer/devcontainer.json | 8 ++++++--
 Dockerfile                      | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 293b1f4..bf301de 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/radix-ai/poetry-cookiecutter",
-  "commit": "8ab7ee0accff3b9cb0e470bfc925858fc04d1e97",
+  "commit": "08c7fcd740fc0807e7de1810950c40fc4ac93013",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4bde056..49a2f25 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -24,8 +24,8 @@
                     "reports/coverage.xml"
                 ],
                 "editor.codeActionsOnSave": {
-                    "source.fixAll": true,
-                    "source.organizeImports": true
+                    "source.fixAll": "explicit",
+                    "source.organizeImports": "explicit"
                 },
                 "editor.formatOnSave": true,
                 "[python]": {
@@ -40,6 +40,10 @@
                 "files.autoSave": "onFocusChange",
                 "jupyter.kernels.excludePythonEnvironments": ["/usr/local/bin/python"],
                 "mypy-type-checker.importStrategy": "fromEnvironment",
+                "notebook.codeActionsOnSave": {
+                    "notebook.source.fixAll": "explicit",
+                    "notebook.source.organizeImports": "explicit"
+                },
                 "notebook.formatOnSave.enabled": true,
                 "python.defaultInterpreterPath": "/opt/conformal-tights-env/bin/python",
                 "python.terminal.activateEnvironment": false,
diff --git a/Dockerfile b/Dockerfile
index d62112e..b685379 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ FROM base as poetry
 USER root
 
 # Install Poetry in separate venv so it doesn't pollute the main venv.
-ENV POETRY_VERSION 1.6.1
+ENV POETRY_VERSION 1.8.0
 ENV POETRY_VIRTUAL_ENV /opt/poetry-env
 RUN --mount=type=cache,target=/root/.cache/pip/ \
     python -m venv $POETRY_VIRTUAL_ENV && \
@@ -70,6 +70,7 @@ RUN --mount=type=cache,target=/var/cache/apt/ \
     sh -c "$(curl -fsSL https://starship.rs/install.sh)" -- "--yes" && \
     usermod --shell /usr/bin/zsh user && \
     echo 'user ALL=(root) NOPASSWD:ALL' > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
+RUN git config --system --add safe.directory '*'
 USER user
 
 # Install the development Python dependencies in the virtual environment.