Merge branch 'master' of https://github.com/microsoft/vscode-python

rchiodo · rchiodo · commit dd82412ef119 · 2020-04-07T16:23:44.000-07:00
diff --git a/experiments.json b/experiments.json
@@ -113,6 +113,18 @@
         "min": 0,
         "max": 100
     },
+    {
+        "name": "LocalZMQKernel - experiment",
+        "salt": "LocalZMQKernel",
+        "max": 0,
+        "min": 0
+    },
+    {
+        "name": "LocalZMQKernel - control",
+        "salt": "LocalZMQKernel",
+        "min": 0,
+        "max": 100
+    },
     {
         "name": "CollectLSRequestTiming - experiment",
         "salt": "CollectLSRequestTiming",
diff --git a/package.json b/package.json
@@ -1567,6 +1567,7 @@
                             "Reload - experiment",
                             "AA_testing - experiment",
                             "WebHostNotebook - experiment",
+                            "LocalZMQKernel - experiment",
                             "UseTerminalToGetActivatedEnvVars - experiment",
                             "CollectLSRequestTiming - experiment",
                             "CollectNodeLSRequestTiming - experiment",
@@ -1589,6 +1590,7 @@
                             "Reload - experiment",
                             "AA_testing - experiment",
                             "WebHostNotebook - experiment",
+                            "LocalZMQKernel - experiment",
                             "UseTerminalToGetActivatedEnvVars - experiment",
                             "CollectLSRequestTiming - experiment",
                             "CollectNodeLSRequestTiming - experiment",
diff --git a/src/client/common/experimentGroups.ts b/src/client/common/experimentGroups.ts
@@ -42,6 +42,12 @@ export enum WebHostNotebook {
     experiment = 'WebHostNotebook - experiment'
 }
 
+// Experiment to use a local ZMQ kernel connection as opposed to starting a Jupyter server locally
+export enum LocalZMQKernel {
+    control = 'LocalZMQKernel - control',
+    experiment = 'LocalZMQKernel - experiment'
+}
+
 /**
  * Experiment to check whether to to use a terminal to generate the environment variables of activated environments.
  *

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,12 @@ export enum WebHostNotebook {`
`42`	`42`	`experiment = 'WebHostNotebook - experiment'`
`43`	`43`	`}`
`44`	`44`
	`45`	`+// Experiment to use a local ZMQ kernel connection as opposed to starting a Jupyter server locally`
	`46`	`+export enum LocalZMQKernel {`
	`47`	`+ control = 'LocalZMQKernel - control',`
	`48`	`+ experiment = 'LocalZMQKernel - experiment'`
	`49`	`+}`
	`50`	`+`
`45`	`51`	`/**`
`46`	`52`	`* Experiment to check whether to to use a terminal to generate the environment variables of activated environments.`
`47`	`53`	`*`