From 770c8edd9abe8451e8ee3147be3341b04ca2dad2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 1 Apr 2019 13:25:31 -0700 Subject: [PATCH 1/9] New point release --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7456547ad3f..238a2307222e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog +## 2019.3.2 (1 April 2019) + +### Fixes + +1. Unable to expand variables in the watch window and the debug console. + ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) + ## 2019.3.1 (28 March 2019) ### Enhancements diff --git a/package-lock.json b/package-lock.json index 76c0f7b85943..f501462b9ac7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "python", - "version": "2019.3.1", + "version": "2019.3.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 145ab24de08e..0e4943d23f02 100644 --- a/package.json +++ b/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.3.1", + "version": "2019.3.2", "languageServerVersion": "0.2.31", "publisher": "ms-python", "author": { From 86cd5fabab24f7f3ec0612c9672d7ec2e2860ff2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 2 Apr 2019 13:06:36 -0700 Subject: [PATCH 2/9] Display survey banner for LS when using current LS --- CHANGELOG.md | 2 ++ src/client/activation/languageServer/analysisOptions.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 238a2307222e..b2e3422e1dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ 1. Unable to expand variables in the watch window and the debug console. ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) +1. Display survey banner for Language Server when using current Lanaguage Server. + ([#5064](https://github.com/Microsoft/vscode-python/issues/5064)) ## 2019.3.1 (28 March 2019) diff --git a/src/client/activation/languageServer/analysisOptions.ts b/src/client/activation/languageServer/analysisOptions.ts index 897112e6a756..521f08565ee3 100644 --- a/src/client/activation/languageServer/analysisOptions.ts +++ b/src/client/activation/languageServer/analysisOptions.ts @@ -10,7 +10,7 @@ import { LanguageClientOptions, ProvideCompletionItemsSignature, RevealOutputCha import { IWorkspaceService } from '../../common/application/types'; import { isTestExecution, PYTHON_LANGUAGE, STANDARD_OUTPUT_CHANNEL } from '../../common/constants'; import { traceDecorators, traceError } from '../../common/logger'; -import { BANNER_NAME_PROPOSE_LS, IConfigurationService, IExtensionContext, IOutputChannel, IPathUtils, IPythonExtensionBanner, Resource } from '../../common/types'; +import { BANNER_NAME_LS_SURVEY, IConfigurationService, IExtensionContext, IOutputChannel, IPathUtils, IPythonExtensionBanner, Resource } from '../../common/types'; import { debounce } from '../../common/utils/decorators'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; import { IInterpreterService } from '../../interpreter/contracts'; @@ -29,7 +29,7 @@ export class LanguageServerAnalysisOptions implements ILanguageServerAnalysisOpt @inject(IEnvironmentVariablesProvider) private readonly envVarsProvider: IEnvironmentVariablesProvider, @inject(IConfigurationService) private readonly configuration: IConfigurationService, @inject(IWorkspaceService) private readonly workspace: IWorkspaceService, - @inject(IPythonExtensionBanner) @named(BANNER_NAME_PROPOSE_LS) private readonly surveyBanner: IPythonExtensionBanner, + @inject(IPythonExtensionBanner) @named(BANNER_NAME_LS_SURVEY) private readonly surveyBanner: IPythonExtensionBanner, @inject(IInterpreterService) private readonly interpreterService: IInterpreterService, @inject(IInterpreterDataService) private readonly interpreterDataService: IInterpreterDataService, @inject(IOutputChannel) @named(STANDARD_OUTPUT_CHANNEL) private readonly output: OutputChannel, From 14b153d06860575571d374290f5ce137842fde09 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 2 Apr 2019 14:08:23 -0700 Subject: [PATCH 3/9] Update version of PTVSD --- CHANGELOG.md | 6 +++++- requirements.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e3422e1dad..1aafc7dd0c93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -## 2019.3.2 (1 April 2019) +## 2019.3.2 (2 April 2019) ### Fixes @@ -9,6 +9,10 @@ ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) 1. Display survey banner for Language Server when using current Lanaguage Server. ([#5064](https://github.com/Microsoft/vscode-python/issues/5064)) +1. Update ptvsd to [4.2.6](https://github.com/Microsoft/ptvsd/releases/tag/v4.2.6). + ([#5083](https://github.com/Microsoft/vscode-python/issues/5083)) + * Fix issue with expanding variables in watch window and hover. + * Fix issue with launching a sub-module. ## 2019.3.1 (28 March 2019) diff --git a/requirements.txt b/requirements.txt index 22819f5005d7..05aca0339e38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ jedi==0.12.0 parso==0.2.1 isort==4.3.4 -ptvsd==4.2.5 +ptvsd==4.2.6 From dc5030927cb73a31c6db362e8ebe9b4ae131d88c Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 2 Apr 2019 14:15:54 -0700 Subject: [PATCH 4/9] Telemetry --- CHANGELOG.md | 6 ++++++ src/client/common/installer/moduleInstaller.ts | 4 ++++ src/client/telemetry/constants.ts | 1 + src/client/telemetry/index.ts | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aafc7dd0c93..191771d462f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,12 @@ * Fix issue with expanding variables in watch window and hover. * Fix issue with launching a sub-module. +### Code Health + +1. Capture telemetry to track installer used when installing packages. + ([#5063](https://github.com/Microsoft/vscode-python/issues/5063)) + + ## 2019.3.1 (28 March 2019) ### Enhancements diff --git a/src/client/common/installer/moduleInstaller.ts b/src/client/common/installer/moduleInstaller.ts index c35546416fc1..6a1384f3b48c 100644 --- a/src/client/common/installer/moduleInstaller.ts +++ b/src/client/common/installer/moduleInstaller.ts @@ -11,11 +11,15 @@ import { STANDARD_OUTPUT_CHANNEL } from '../constants'; import { ITerminalServiceFactory } from '../terminal/types'; import { ExecutionInfo, IConfigurationService, IOutputChannel } from '../types'; import { noop } from '../utils/misc'; +import { sendTelemetryEvent } from '../../telemetry'; +import { EventName } from '../../telemetry/constants'; @injectable() export abstract class ModuleInstaller { + public abstract get displayName(): string constructor(protected serviceContainer: IServiceContainer) { } public async installModule(name: string, resource?: vscode.Uri): Promise { + sendTelemetryEvent(EventName.PYTHON_INSTALL_PACKAGE, undefined, { installer: this.displayName }); const executionInfo = await this.getExecutionInfo(name, resource); const terminalService = this.serviceContainer.get(ITerminalServiceFactory).getTerminalService(resource); diff --git a/src/client/telemetry/constants.ts b/src/client/telemetry/constants.ts index 863c4b4b8b8b..c75f9a2be95b 100644 --- a/src/client/telemetry/constants.ts +++ b/src/client/telemetry/constants.ts @@ -23,6 +23,7 @@ export enum EventName { REFACTOR_EXTRACT_FUNCTION = 'REFACTOR_EXTRACT_FUNCTION', REPL = 'REPL', PYTHON_INTERPRETER = 'PYTHON_INTERPRETER', + PYTHON_INSTALL_PACKAGE = 'PYTHON_INSTALL_PACKAGE', PYTHON_INTERPRETER_DISCOVERY = 'PYTHON_INTERPRETER_DISCOVERY', PYTHON_INTERPRETER_AUTO_SELECTION = 'PYTHON_INTERPRETER_AUTO_SELECTION', PYTHON_INTERPRETER_ACTIVATION_ENVIRONMENT_VARIABLES = 'PYTHON_INTERPRETER_ACTIVATION_ENVIRONMENT_VARIABLES', diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts index 4fd1ff946f63..1c9bd9dc4090 100644 --- a/src/client/telemetry/index.ts +++ b/src/client/telemetry/index.ts @@ -274,7 +274,7 @@ export interface IEventNamePropertyMapping { [EventName.HOVER_DEFINITION]: never | undefined; [EventName.KNOWN_IMPORT_FROM_FILE]: { import: string }; [EventName.KNOWN_IMPORT_FROM_EXECUTION]: { import: string }; - [EventName.LINTER_NOT_INSTALLED_PROMPT]: LinterInstallPromptTelemetry; + [EventName.PYTHON_INSTALL_PACKAGE]: { installer: string }; [EventName.LINTING]: LintingTelemetry; [EventName.PLATFORM_INFO]: Platform; [EventName.PYTHON_INTERPRETER]: PythonInterpreterTelemetry; From 8bbdb95ace574c7a9bee06f448dc199748fd7e25 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 2 Apr 2019 14:29:32 -0700 Subject: [PATCH 5/9] Oops --- src/client/telemetry/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts index 1c9bd9dc4090..1d3a76172e36 100644 --- a/src/client/telemetry/index.ts +++ b/src/client/telemetry/index.ts @@ -274,6 +274,7 @@ export interface IEventNamePropertyMapping { [EventName.HOVER_DEFINITION]: never | undefined; [EventName.KNOWN_IMPORT_FROM_FILE]: { import: string }; [EventName.KNOWN_IMPORT_FROM_EXECUTION]: { import: string }; + [EventName.LINTER_NOT_INSTALLED_PROMPT]: LinterInstallPromptTelemetry; [EventName.PYTHON_INSTALL_PACKAGE]: { installer: string }; [EventName.LINTING]: LintingTelemetry; [EventName.PLATFORM_INFO]: Platform; From ad1f3e967b754a4e931650d3fac52c5ec68f59d2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Tue, 2 Apr 2019 14:29:47 -0700 Subject: [PATCH 6/9] Linter issues --- src/client/common/installer/moduleInstaller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/common/installer/moduleInstaller.ts b/src/client/common/installer/moduleInstaller.ts index 6a1384f3b48c..eab4e592486b 100644 --- a/src/client/common/installer/moduleInstaller.ts +++ b/src/client/common/installer/moduleInstaller.ts @@ -7,12 +7,12 @@ import * as path from 'path'; import * as vscode from 'vscode'; import { IInterpreterService, InterpreterType } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; +import { sendTelemetryEvent } from '../../telemetry'; +import { EventName } from '../../telemetry/constants'; import { STANDARD_OUTPUT_CHANNEL } from '../constants'; import { ITerminalServiceFactory } from '../terminal/types'; import { ExecutionInfo, IConfigurationService, IOutputChannel } from '../types'; import { noop } from '../utils/misc'; -import { sendTelemetryEvent } from '../../telemetry'; -import { EventName } from '../../telemetry/constants'; @injectable() export abstract class ModuleInstaller { From 5f5aea358cbb4a8efbcba2c6b20b88dcfd66cc11 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 2 Apr 2019 14:53:04 -0700 Subject: [PATCH 7/9] Update CHANGELOG.md Co-Authored-By: DonJayamanne --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 191771d462f7..f660c99f0cd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Fixes -1. Unable to expand variables in the watch window and the debug console. +1. Fix regression preventing the expansion of variables in the watch window and the debug console. ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) 1. Display survey banner for Language Server when using current Lanaguage Server. ([#5064](https://github.com/Microsoft/vscode-python/issues/5064)) From 509b565e688cb1f9436f020b6050f23cf3a2bd35 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 2 Apr 2019 14:53:10 -0700 Subject: [PATCH 8/9] Update CHANGELOG.md Co-Authored-By: DonJayamanne --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f660c99f0cd2..b73d3e150ef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ 1. Fix regression preventing the expansion of variables in the watch window and the debug console. ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) -1. Display survey banner for Language Server when using current Lanaguage Server. +1. Display survey banner (again) for Language Server when using current Lanaguage Server. ([#5064](https://github.com/Microsoft/vscode-python/issues/5064)) 1. Update ptvsd to [4.2.6](https://github.com/Microsoft/ptvsd/releases/tag/v4.2.6). ([#5083](https://github.com/Microsoft/vscode-python/issues/5083)) From 3ca11bdc6d0cce8a55fce73e1cd5b3ed84897b01 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 2 Apr 2019 14:53:18 -0700 Subject: [PATCH 9/9] Update CHANGELOG.md Co-Authored-By: DonJayamanne --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b73d3e150ef9..e10f3bf0ac03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ ### Code Health -1. Capture telemetry to track installer used when installing packages. +1. Capture telemetry to track which installer was used when installing packages via the extension. ([#5063](https://github.com/Microsoft/vscode-python/issues/5063))