From ee16922eba0d8ca09ea4172b342d513de7fc5bef Mon Sep 17 00:00:00 2001
From: Stefan Kairinos <stefan.kairinos@ocado.com>
Date: Wed, 10 Jul 2024 16:48:47 +0100
Subject: [PATCH] single dev container (#2321)

---
 .devcontainer.json                | 42 -------------------------------
 .gitignore                        |  1 +
 .vscode/codeforlife.code-snippets | 35 --------------------------
 .vscode/launch.json               |  3 +++
 .vscode/settings.json             |  6 ++++-
 codeforlife.code-workspace        | 14 -----------
 6 files changed, 9 insertions(+), 92 deletions(-)
 delete mode 100644 .devcontainer.json
 delete mode 100644 .vscode/codeforlife.code-snippets
 delete mode 100644 codeforlife.code-workspace

diff --git a/.devcontainer.json b/.devcontainer.json
deleted file mode 100644
index 3c48bd7f3..000000000
--- a/.devcontainer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "visualstudioexptteam.vscodeintellicode",
-        "github.vscode-pull-request-github",
-        "redhat.vscode-yaml",
-        "davidanson.vscode-markdownlint",
-        "bierner.markdown-mermaid",
-        "streetsidesoftware.code-spell-checker",
-        "ms-python.python",
-        "ms-python.debugpy",
-        "ms-python.pylint",
-        "ms-python.isort",
-        "ms-python.vscode-pylance",
-        "ms-python.mypy-type-checker",
-        "ms-python.black-formatter",
-        "qwtel.sqlite-viewer",
-        "njpwerner.autodocstring"
-      ]
-    }
-  },
-  "dockerComposeFile": [
-    "../docker-compose.yml"
-  ],
-  "features": {
-    "ghcr.io/devcontainers-contrib/features/pipenv:2": {
-      "version": "2023.11.15"
-    },
-    "ghcr.io/devcontainers/features/python:1": {
-      "installTools": false,
-      "version": "3.8"
-    },
-    "ghcr.io/kreemer/features/chrometesting:1": {}
-  },
-  "name": "portal",
-  "postCreateCommand": "pipenv install --dev",
-  "remoteUser": "root",
-  "service": "base-service",
-  "shutdownAction": "none",
-  "workspaceFolder": "/workspace/codeforlife-portal"
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index f7fd348bd..bbcb38bb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ dist/
 ngrok
 
 .venv
+.coverage
\ No newline at end of file
diff --git a/.vscode/codeforlife.code-snippets b/.vscode/codeforlife.code-snippets
deleted file mode 100644
index c54a2b164..000000000
--- a/.vscode/codeforlife.code-snippets
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "python.module.docstring": {
-    "body": [
-      "\"\"\"",
-      "\u00a9 Ocado Group",
-      "Created on $CURRENT_DATE/$CURRENT_MONTH/$CURRENT_YEAR at $CURRENT_HOUR:$CURRENT_MINUTE:$CURRENT_SECOND($CURRENT_TIMEZONE_OFFSET).",
-      "",
-      "${1:__description__}",
-      "\"\"\""
-    ],
-    "prefix": [
-      "\"\"\"",
-      "'''"
-    ],
-    "scope": "python"
-  },
-  "python.mypy.ignore": {
-    "body": [
-      "# type: ignore[${1:__code_name__}]"
-    ],
-    "prefix": [
-      "# type"
-    ],
-    "scope": "python"
-  },
-  "python.pylint.disable-next": {
-    "body": [
-      "# pylint: disable-next=${1:__code_name__}"
-    ],
-    "prefix": [
-      "# pylint"
-    ],
-    "scope": "python"
-  }
-}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6f185c78a..678a70df1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -21,6 +21,9 @@
       "type": "debugpy"
     },
     {
+      "env": {
+        "PYTEST_ADDOPTS": "--no-cov"
+      },
       "justMyCode": false,
       "name": "Pytest",
       "presentation": {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9e1e8e984..02c464e97 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -63,10 +63,14 @@
   "python.defaultInterpreterPath": ".venv/bin/python",
   "python.testing.pytestArgs": [
     "-n=auto",
+    "--cov=.",
+    "--cov-report=html",
     "-c=pyproject.toml",
     "."
   ],
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
-  "python.analysis.extraPaths": ["./cfl_common"]
+  "python.analysis.extraPaths": [
+    "./cfl_common"
+  ]
 }
\ No newline at end of file
diff --git a/codeforlife.code-workspace b/codeforlife.code-workspace
deleted file mode 100644
index 547da3b33..000000000
--- a/codeforlife.code-workspace
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "folders": [
-    {
-      "name": "portal",
-      "path": "."
-    }
-  ],
-  "settings": {
-    "autoDocstring.customTemplatePath": ".vscode/extensions/autoDocstring/docstring.mustache",
-    "workbench.colorCustomizations": {
-      "editorRuler.foreground": "#008000"
-    }
-  }
-}
\ No newline at end of file