Merge September release back into master

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2019.9.0 (27 August 2019)
+## 2019.9.0 (3 September 2019)
 
 ### Enhancements
 
@@ -29,6 +29,8 @@
 
 ### Fixes
 
+1. Delete the old session immediatly after session restart instead of on close
+   ([#6975](https://github.com/Microsoft/vscode-python/issues/6975))
 1. Add support for the "pathMappings" setting in "launch" debug configs.
    ([#3568](https://github.com/Microsoft/vscode-python/issues/3568))
 1. Supports error codes like ABC123 as used in plugins.

build/ci/vscode-python-nightly-ci.yaml

@@ -1,6 +1,4 @@
 # Nightly build
-# Notes: Scheduled builds don't have a trigger in YAML (as of this writing).
-#        Trigger is set through the Azure DevOps UI `Nightly Build->Edit->...->Triggers`.
 
 name: '$(Year:yyyy).$(Month).0.$(BuildID)-alpha'
 
@@ -10,6 +8,16 @@ trigger: none
 # Not the PR build for merges to master and release.
 pr: none
 
+schedules:
+- cron: "0 0 * * 1-5"
+  # Daily midnight build, runs Monday - Friday always
+  displayName: Nightly build
+  branches:
+    include:
+    - master
+    - release
+  always: true
+
 # Variables that are available for the entire pipeline.
 variables:
   PythonVersion: '3.7'

package.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, and more.",
-    "version": "2019.9.0-rc",
+    "version": "2019.10.0-dev",
     "languageServerVersion": "0.3.66",
     "publisher": "ms-python",
     "author": {

src/client/datascience/jupyter/jupyterSession.ts

@@ -46,7 +46,6 @@ export class JupyterSession implements IJupyterSession {
     private statusHandler: Slot<Session.ISession, Kernel.Status> | undefined;
     private connected: boolean = false;
     private jupyterPasswordConnect: IJupyterPasswordConnect;
-    private oldSessions: Session.ISession[] = [];
 
     constructor(
         connInfo: IConnection,
@@ -124,8 +123,8 @@ export class JupyterSession implements IJupyterSession {
             if (oldStatusHandler) {
                 oldSession.statusChanged.disconnect(oldStatusHandler);
             }
-            // Don't shutdown old sessions yet. This seems to hang tests.
-            this.oldSessions.push(oldSession);
+
+            this.shutdownSession(oldSession, undefined).ignoreErrors();
         } else {
             throw new Error(localize.DataScience.sessionDisposed());
         }
@@ -207,8 +206,7 @@ export class JupyterSession implements IJupyterSession {
                 traceInfo(`Error waiting for restart session: ${exc}`);
                 tryCount += 1;
                 if (result) {
-                    // Cleanup later.
-                    this.oldSessions.push(result);
+                    this.shutdownSession(result, undefined).ignoreErrors();
                 }
                 result = undefined;
                 exception = exc;
@@ -375,8 +373,6 @@ export class JupyterSession implements IJupyterSession {
         }
         if (this.session || this.sessionManager) {
             try {
-                traceInfo('ShutdownSessionAndConnection - old sessions');
-                await Promise.all(this.oldSessions.map(s => this.shutdownSession(s, undefined)));
                 traceInfo('ShutdownSessionAndConnection - current session');
                 await this.shutdownSession(this.session, this.statusHandler);
                 traceInfo('ShutdownSessionAndConnection - get restart session');