Merge pull request #13 from qubitron/master

Updating Python dev container definitions

Author: Chuxel

containers/python-2/.devcontainer/Dockerfile

@@ -3,18 +3,19 @@
 # Licensed under the MIT License. See LICENSE in the project root for license information.
 #-----------------------------------------------------------------------------------------
 
-FROM python:2-slim
+FROM python:2
 
 # Copy endpoint specific user settings overrides into container to specify Python path
-COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
 
 RUN pip install pylint
 
 # Install git, process tools
 RUN apt-get update && apt-get -y install git procps
 
-# Install any missing dependencies for enhanced language service
-RUN apt-get install -y libicu57
+# Install Python dependencies from requirements.txt if it exists
+COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
+RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt*; fi
 
 # Clean up
 RUN apt-get autoremove -y \

containers/python-2/.devcontainer/devcontainer.json

@@ -1,8 +1,10 @@
 {
 	"name": "Python 2",
+	"context": "..",
 	"dockerFile": "Dockerfile",
+	"workspaceFolder": "/workspace",
 	"extensions": [
 		"ms-python.python",
-		"LittleFoxTeam.vscode-python-test-adapter"
+		"VisualStudioExptTeam.vscodeintellicode"
 	]
 }

containers/python-3-django/test-project/db.sqlite3 renamed to containers/python-2/.devcontainer/requirements.txt.temp

@@ -2,7 +2,7 @@
 
 ## Summary
 
-*A basic dev container definition for developing Python 2 applications in a container. Includes everything you need to get up and running like PyLint and the Python extension.*
+*A basic dev container definition for developing Python 2 applications in a container. Installs dependencies from your requirements.txt file and the Python extension.*
 
 | Metadata | Value |  
 |----------|-------|

containers/python-2/README.md

@@ -3,25 +3,23 @@
 # Licensed under the MIT License. See LICENSE in the project root for license information.
 #-----------------------------------------------------------------------------------------
 
-FROM python:3
+FROM continuumio/anaconda3
 
 # Copy default endpoint specific user settings overrides into container to specify Python path
-COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+
+# Install git, process tools
+RUN apt-get update && apt-get -y install git procps
 
 RUN mkdir /workspace
 WORKDIR /workspace
 
-# Install pylint, flask, redis
-COPY requirements.txt /workspace/
-RUN pip install -r requirements.txt && rm -f requirements.txt
-
-# Install git
-RUN apt-get update && apt-get -y install git
-
-# Install any missing dependencies for enhanced language service
-RUN apt-get install -y libicu[0-9][0-9]
+# Install Python dependencies from requirements.txt if it exists
+COPY .devcontainer/environment.yml.temp environment.yml* /workspace/
+RUN if [ -f "environment.yml" ]; then conda env update base -f environment.yml && rm environment.yml*; fi
 
 # Clean up
 RUN apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
+

containers/python-3-flask-redis/.devcontainer/Dockerfile renamed to containers/python-3-anaconda/.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+{
+	"name": "Python 3 - Anaconda",
+	"context": "..",
+	"dockerFile": "Dockerfile",
+	"appPort": "5000:5000",
+	"workspaceFolder": "/workspace",
+	"extensions": [
+		"ms-python.python",
+		"VisualStudioExptTeam.vscodeintellicode"
+	]
+}

containers/python-3-anaconda/.devcontainer/devcontainer.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/opt/conda/bin/python"
+}

containers/python-3-django/test-project/web_project/__init__.py renamed to containers/python-3-anaconda/.devcontainer/environment.yml.temp

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File (Integrated Terminal)",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        }
+    ]
+}