DC updates

Author: pamelafox

Diff for: .devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 ARG VARIANT=bullseye
-FROM --platform=amd64 mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
+FROM --platform=amd64 mcr.microsoft.com/devcontainers/python:0-${VARIANT}
 RUN curl -fsSL https://aka.ms/install-azd.sh | bash \
     && curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
     && mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg \

Diff for: .devcontainer/devcontainer.json

@@ -3,35 +3,26 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "VARIANT": "bullseye"
+            "VARIANT": "3.10-bullseye"
         }
     },
     "features": {
-        "ghcr.io/devcontainers/features/azure-cli:1": {
-            "version": "2.38"
-        },
-        "ghcr.io/devcontainers/features/docker-from-docker:1": {
-            "version": "20.10"
-        },
-        "ghcr.io/devcontainers/features/github-cli:1": {
-            "version": "2"
-        },
         "ghcr.io/devcontainers/features/node:1": {
             "version": "16",
             "nodeGypDependencies": false
-        },
-        "ghcr.io/devcontainers/features/python:1": {
-            "version": "os-provided"
         }
     },
-    "extensions": [
-        "ms-azuretools.azure-dev",
-        "ms-azuretools.vscode-bicep",
-        "ms-azuretools.vscode-docker",
-        "ms-vscode.vscode-node-azure-pack",
-        "ms-python.python",
-        "ms-azuretools.vscode-azurefunctions"
-    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-bicep",
+                "ms-vscode.vscode-node-azure-pack",
+                "ms-python.python",
+                "ms-azuretools.vscode-azurefunctions"
+            ]
+        }
+    },
     "forwardPorts": [
         8000,
         7071

Diff for: .github/workflows/azure-dev-validate.yaml

@@ -20,4 +20,4 @@ jobs:
       - name: Azure CLI script
         uses: azure/CLI@v1
         with:
-          inlineScript: az bicep build -f infra/main.bicep
+          inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep

Diff for: .github/workflows/python-check.yaml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-20.04"]
-        python_version: ["3.9"]
+        python_version: ["3.9", "3.10"]
     steps:
         - uses: actions/checkout@v3
         - name: Setup python
@@ -29,7 +29,7 @@ jobs:
         - name: Lint with ruff
           run: ruff api/
         - name: Check pyupgrade
-          run: pyupgrade --py39-plus api/*.py
+          run: pyupgrade --py310-plus api/*.py
         - name: Check formatting with black
           run: black api/ --check --verbose
         - name: Check Python import sorting

Diff for: .pre-commit-config.yaml

@@ -6,21 +6,11 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.121
+    rev: v0.0.237
     hooks:
     -   id: ruff
--   repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
-    hooks:
-    -   id: pyupgrade
-        args: ['--py39-plus']
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.12.0
     hooks:
     -   id: black
         args: ['--config=./pyproject.toml']
--   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        name: isort (python)

Diff for: azure.yaml

@@ -1,7 +1,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
 
 name: fastapi-azure-function-apim
-
+metadata:
+  template: [email protected]
 services:
   api:
     project: .

Diff for: infra/main.bicep

@@ -86,7 +86,7 @@ module functionApp 'core/host/functions.bicep' = {
     applicationInsightsName: appInsightsName
     appServicePlanId: appServicePlan.outputs.id
     runtimeName: 'python'
-    runtimeVersion: '3.9'
+    runtimeVersion: '3.10'
     storageAccountName: storageAccount.outputs.name
   }
 }

Diff for: pyproject.toml

@@ -1,13 +1,11 @@
 [tool.black]
 line-length = 120
-target-version = ['py39']
+target-version = ['py30']
 
 [tool.ruff]
 line-length = 120
-ignore = ['D203']
-
-[tool.isort]
-profile = "black"
+target-version = "py310"
+select = ["E", "F", "I", "UP"]
 
 [tool.pytest.ini_options]
 addopts = "-ra --cov --cov-fail-under=100"

Diff for: requirements-dev.txt

@@ -1,9 +1,7 @@
 -r requirements.txt
 fastapi[all]
 black
-isort
 ruff
-pyupgrade
 pytest
 coverage
 pytest-cov