From 1372aa03f9e1c7ed0a58e9d3dca1206d2e2aa422 Mon Sep 17 00:00:00 2001
From: Arthur Lu <learthurgo@gmail.com>
Date: Fri, 4 Feb 2022 09:19:39 +0000
Subject: [PATCH 1/2] switch docker image to python:slim, move requirements.txt
 to .devcontainer/

---
 .devcontainer/Dockerfile                      | 11 +++++-----
 .devcontainer/dev-dockerfile                  |  2 --
 .devcontainer/devcontainer.json               | 20 +++++++------------
 .../requirements.txt                          |  0
 4 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 .devcontainer/dev-dockerfile
 rename {analysis-master => .devcontainer}/requirements.txt (100%)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 160a9b91..f762d033 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,7 +1,6 @@
-FROM ubuntu:20.04
+FROM python:slim
 WORKDIR /
-RUN apt-get -y update
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
-RUN apt-get install -y python3 python3-dev git python3-pip python3-kivy python-is-python3 libgl1-mesa-dev build-essential
-RUN ln -s $(which pip3) /usr/bin/pip
-RUN pip install pymongo pandas numpy scipy scikit-learn matplotlib pylint kivy
\ No newline at end of file
+RUN apt-get -y update; apt-get -y upgrade
+RUN apt-get -y install git
+COPY requirements.txt .
+RUN pip install -r requirements.txt
\ No newline at end of file
diff --git a/.devcontainer/dev-dockerfile b/.devcontainer/dev-dockerfile
deleted file mode 100644
index 74659d49..00000000
--- a/.devcontainer/dev-dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM titanscout2022/tra-analysis-base:latest
-WORKDIR /
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3eb4364b..f62f520e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,28 +1,22 @@
 {
     "name": "TRA Analysis Development Environment",
     "build": {
-		"dockerfile": "dev-dockerfile",
+		"dockerfile": "Dockerfile",
     },
     "settings": { 
 		"terminal.integrated.shell.linux": "/bin/bash",
-		"python.pythonPath": "/usr/local/bin/python",
+		"python.pythonPath": "",
 		"python.linting.enabled": true,
 		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-		"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest"
+		"python.linting.pylintPath": "",
+		"python.testing.pytestPath": "",
+    "editor.tabSize": 4,
+    "editor.insertSpaces": false
 	},
 	"extensions": [
 		"mhutchie.git-graph",
 		"ms-python.python",
 		"waderyan.gitblame"
 	],
-		"postCreateCommand": "/usr/bin/pip3 install -r ${containerWorkspaceFolder}/analysis-master/requirements.txt && /usr/bin/pip3 install --no-cache-dir pylint && /usr/bin/pip3 install pytest"
+		"postCreateCommand": ""
 	}
\ No newline at end of file
diff --git a/analysis-master/requirements.txt b/.devcontainer/requirements.txt
similarity index 100%
rename from analysis-master/requirements.txt
rename to .devcontainer/requirements.txt

From 8ae1593861c0dee34467ba2738682a2784bf49ea Mon Sep 17 00:00:00 2001
From: Arthur Lu <learthurgo@gmail.com>
Date: Tue, 8 Feb 2022 07:20:31 +0000
Subject: [PATCH 2/2] add pylint pytest to requirements.txt

---
 .devcontainer/requirements.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt
index fd8eb2ee..1b3d6fa6 100644
--- a/.devcontainer/requirements.txt
+++ b/.devcontainer/requirements.txt
@@ -2,4 +2,7 @@ numpy
 scipy
 scikit-learn
 six
-pyparsing
\ No newline at end of file
+pyparsing
+
+pylint
+pytest
\ No newline at end of file