Make sure language is used when picking kernel specs (microsoft#5628)

rchiodo · web-flow · commit f1deef6f3cf0 · 2019-05-14T13:15:48.000-07:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,34 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM node:8
+
+# Configure apt
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends apt-utils 2>&1
+
+# Verify git and needed tools are installed
+RUN apt-get install -y git procps
+
+# Remove outdated yarn from /opt and install via package 
+# so it can be easily updated via apt-get upgrade yarn
+RUN rm -rf /opt/yarn-* \
+    && rm -f /usr/local/bin/yarn \
+    && rm -f /usr/local/bin/yarnpkg \
+    && apt-get install -y curl apt-transport-https lsb-release \
+    && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
+    && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update \
+    && apt-get -y install --no-install-recommends yarn
+
+# Install tslint and typescript
+RUN npm install -g tslint typescript
+
+# Clean up
+RUN apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,8 @@
+// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+{
+	"name": "Node.js 8 & TypeScript",
+	"dockerFile": "Dockerfile",
+	"extensions": [
+		"ms-vscode.vscode-typescript-tslint-plugin"
+	]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -2,6 +2,22 @@
 {
     "version": "0.1.0",
     "configurations": [
+        {
+            "name": "Extension inside container",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}", "${workspaceFolder}/data"
+            ],
+            "stopOnEntry": false,
+            "smartStep": true,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceFolder}/out/**/*"
+            ],
+            "preLaunchTask": "Compile"
+        },
         {
             "name": "Python: Current File with iPython",
             "type": "python",
diff --git a/data/.vscode/settings.json b/data/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/bin/python3"
+}
diff --git a/data/get-pip.py b/data/get-pip.py
diff --git a/data/test.py b/data/test.py
@@ -0,0 +1,2 @@
+#%%
+print('hello')
diff --git a/news/2 Fixes/5586.md b/news/2 Fixes/5586.md
@@ -0,0 +1 @@
+Fix problems if other language kernels are installed that are using python under the covers (bash is one such example).
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/client/datascience/jupyter/jupyterExecution.ts b/src/client/datascience/jupyter/jupyterExecution.ts
@@ -590,14 +590,17 @@ export class JupyterExecutionBase implements IJupyterExecution {
             const spec = specs[i];
             let score = 0;
 
-            if (spec && spec.path && spec.path.length > 0 && info && spec.path === info.path) {
-                // Path match
-                score += 10;
-            }
+            // First match on language. No point if not python.
             if (spec && spec.language && spec.language.toLocaleLowerCase() === 'python') {
                 // Language match
                 score += 1;
 
+                // See if the path matches. Don't bother if the language doesn't.
+                if (spec && spec.path && spec.path.length > 0 && info && spec.path === info.path) {
+                    // Path match
+                    score += 10;
+                }
+
                 // See if the version is the same
                 if (info && info.version && specDetails[i]) {
                     const details = specDetails[i];

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "python.pythonPath": "/usr/bin/python3"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix problems if other language kernels are installed that are using python under the covers (bash is one such example).`