Many changes related to python upgrade, etc.

Signed-off-by: jamshale <jamiehalebc@gmail.com>
hyperledger · Jul 8, 2024 · b0db30c · b0db30c
1 parent 3d218ee
commit b0db30c
Show file tree

Hide file tree

Showing 85 changed files with 5,897 additions and 7,923 deletions.
diff --git a/basicmessage_storage/.devcontainer/Dockerfile b/basicmessage_storage/.devcontainer/Dockerfile
@@ -1,8 +1,8 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/python-3/.devcontainer/base.Dockerfile
-ARG VARIANT="3.9-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
+ARG VARIANT="3.12"
+FROM mcr.microsoft.com/devcontainers/python:${VARIANT}
 
-ARG POETRY_VERSION="1.7.1"
+ARG POETRY_VERSION="1.8.3"
 ENV POETRY_HOME="/opt/poetry" \
     POETRY_VERSION=${POETRY_VERSION}
 

diff --git a/basicmessage_storage/.devcontainer/devcontainer.json b/basicmessage_storage/.devcontainer/devcontainer.json
@@ -6,8 +6,8 @@
     "dockerfile": "Dockerfile",
     "context": "..",
     "args": {
-      "VARIANT": "3.9-bullseye",
-      "POETRY_VERSION": "1.7.1"
+      "VARIANT": "3.12-bullseye",
+      "POETRY_VERSION": "1.8.3"
     }
   },
   "customizations": {
@@ -21,11 +21,20 @@
         "editor.defaultFormatter": null,
         "editor.formatOnSave": false, // enable per language
         "[python]": {
-          "editor.formatOnSave": true
+          "editor.formatOnSave": true,
+          "editor.codeActionsOnSave": {
+              "source.fixAll": true,
+              "source.organizeImports": true
+            },
+          "editor.defaultFormatter": "charliermarsh.ruff",
+          "ruff.organizeImports": true
         },
-        "python.formatting.provider": "black",
-        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-        "python.formatting.blackArgs": []
+        "ruff.codeAction.fixViolation": {
+            "enable": true
+        },
+        "ruff.fixAll": true,
+        "ruff.format.args": ["--config=./pyproject.toml"],
+        "ruff.lint.args": ["--config=./pyproject.toml"]
       }
     }
   },

diff --git a/basicmessage_storage/.devcontainer/post-install.sh b/basicmessage_storage/.devcontainer/post-install.sh
@@ -6,6 +6,3 @@ WORKSPACE_DIR=$(pwd)
 
 # install all ACA-Py requirements
 python -m pip install --upgrade pip
-
-# install black for formatting
-pip3 install black
diff --git a/basicmessage_storage/docker/Dockerfile b/basicmessage_storage/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-slim AS base
+FROM python:3.12-slim AS base
 WORKDIR /usr/src/app
 
 # Install and configure poetry
@@ -19,7 +19,7 @@ ARG install_flags='--with integration --extras aca-py'
 RUN poetry install ${install_flags}
 USER $user
 
-FROM python:3.9-bullseye
+FROM python:3.12-bullseye
 WORKDIR /usr/src/app
 COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
 ENV PATH="/usr/src/app/.venv/bin:$PATH"

diff --git a/basicmessage_storage/integration/Dockerfile.test.runner b/basicmessage_storage/integration/Dockerfile.test.runner
@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.12-slim
 WORKDIR /usr/src/app
 
 # install poetry

diff --git a/basicmessage_storage/integration/poetry.lock b/basicmessage_storage/integration/poetry.lock
diff --git a/basicmessage_storage/integration/pyproject.toml b/basicmessage_storage/integration/pyproject.toml
@@ -5,8 +5,8 @@ description = ""
 authors = []
 
 [tool.poetry.dependencies]
-python = "^3.9"
-pytest = "^8.2.0"
+python = "^3.12"
+pytest = "^8.2.2"
 pytest-asyncio = "~0.23.7"
 requests = "^2.32.0"