Remove more unnecessary interpreter types (#31)

.eslintrc

@@ -33,7 +33,12 @@
         "@typescript-eslint/no-empty-interface": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
         "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": "error",
+        "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_"
+            }
+        ],
         "no-use-before-define": "off",
         "@typescript-eslint/no-use-before-define": [
             "error",
@@ -87,6 +92,7 @@
         "no-control-regex": "off",
         "function-paren-newline": "off",
         "consistent-return": "off",
+        "class-methods-use-this": "off",
         "no-extend-native": "off",
         "no-multi-str": "off",
         "no-param-reassign": "off",

src/client/activation/activationService.ts

@@ -288,7 +288,7 @@ export class LanguageServerExtensionActivationService
             workspacePathNameForGlobalWorkspaces
         );
         interpreter = interpreter ? interpreter : await this.interpreterService.getActiveInterpreter(resource);
-        const interperterPortion = interpreter ? `${interpreter.path}-${interpreter.envName}` : '';
+        const interperterPortion = interpreter ? `${interpreter.path}` : '';
         return `${resourcePortion}-${interperterPortion}`;
     }
 

src/client/datascience/jupyter/kernels/kernelDependencyService.ts

@@ -41,7 +41,7 @@ export class KernelDependencyService implements IKernelDependencyService {
             token
         });
         const message = DataScience.libraryRequiredToLaunchJupyterKernelNotInstalledInterpreter().format(
-            interpreter.displayName || interpreter.envName || interpreter.path,
+            interpreter.displayName || interpreter.path,
             ProductNames.get(Product.ipykernel)!
         );
         const installerToken = wrapCancellationTokens(token);

src/client/datascience/jupyter/kernels/kernelService.ts

@@ -53,7 +53,6 @@ function isInterpreter(item: nbformat.IKernelspecMetadata | PythonEnvironment):
     // Interpreters will not have a `display_name` property, but have `path` and `type` properties.
     return (
         !!(item as PythonEnvironment).path &&
-        !!(item as PythonEnvironment).envType &&
         !(item as nbformat.IKernelspecMetadata).display_name
     );
 }

src/client/pythonEnvironments/info/index.ts

@@ -3,26 +3,8 @@
 
 'use strict';
 
-import { Architecture } from '../../common/utils/platform';
 import { PythonVersion } from './pythonVersion';
 
-/**
- * The supported Python environment types.
- */
-export enum EnvironmentType {
-    Unknown = 'Unknown',
-    Conda = 'Conda',
-    VirtualEnv = 'VirtualEnv',
-    Pipenv = 'PipEnv',
-    Pyenv = 'Pyenv',
-    Venv = 'Venv',
-    WindowsStore = 'WindowsStore',
-    Poetry = 'Poetry',
-    VirtualEnvWrapper = 'VirtualEnvWrapper',
-    Global = 'Global',
-    System = 'System'
-}
-
 type ReleaseLevel = 'alpha' | 'beta' | 'candidate' | 'final' | 'unknown';
 
 /**
@@ -46,7 +28,6 @@ export type InterpreterInformation = {
     path: string;
     version?: PythonVersion;
     sysVersion?: string;
-    architecture: Architecture;
     sysPrefix: string;
 };
 
@@ -64,7 +45,4 @@ export type InterpreterInformation = {
 // and doesn't really belong here.
 export type PythonEnvironment = InterpreterInformation & {
     displayName?: string;
-    envType: EnvironmentType;
-    envName?: string;
-    envPath?: string;
 };

src/client/pythonEnvironments/info/interpreter.ts

@@ -2,10 +2,9 @@
 // Licensed under the MIT License.
 
 import { InterpreterInformation } from '.';
+import { parsePythonVersion } from '../../../test/interpreters/pythonVersion';
 import { interpreterInfo as getInterpreterInfoCommand, PythonEnvInfo } from '../../common/process/internal/scripts';
-import { Architecture } from '../../common/utils/platform';
 import { copyPythonExecInfo, PythonExecInfo } from '../exec';
-import { parsePythonVersion } from './pythonVersion';
 
 /**
  * Compose full interpreter information based on the given data.
@@ -18,7 +17,6 @@ import { parsePythonVersion } from './pythonVersion';
 export function extractInterpreterInfo(python: string, raw: PythonEnvInfo): InterpreterInformation {
     const rawVersion = `${raw.versionInfo.slice(0, 3).join('.')}-${raw.versionInfo[3]}`;
     return {
-        architecture: raw.is64Bit ? Architecture.x64 : Architecture.x86,
         path: python,
         version: parsePythonVersion(rawVersion),
         sysVersion: raw.sysVersion,

src/client/pythonEnvironments/info/pythonVersion.ts

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { SemVer } from 'semver';
-import '../../common/extensions'; // For string.splitLines()
-
 /**
  * A representation of a Python runtime's version.
  *
@@ -28,47 +25,3 @@ export type PythonVersion = {
     build: string[];
     prerelease: string[];
 };
-
-/**
- * Convert a Python version string.
- *
- * The supported formats are:
- *
- *  * MAJOR.MINOR.MICRO-RELEASE_LEVEL
- *
- *  (where RELEASE_LEVEL is one of {alpha,beta,candidate,final})
- *
- * Everything else, including an empty string, results in `undefined`.
- */
-// Eventually we will want to also support the release serial
-// (e.g. beta1, candidate3) and maybe even release abbreviations
-// (e.g. 3.9.2b1, 3.8.10rc3).
-export function parsePythonVersion(raw: string): PythonVersion | undefined {
-    if (!raw || raw.trim().length === 0) {
-        return;
-    }
-    const versionParts = (raw || '')
-        .split('.')
-        .map((item) => item.trim())
-        .filter((item) => item.length > 0)
-        .filter((_, index) => index < 4);
-
-    if (versionParts.length > 0 && versionParts[versionParts.length - 1].indexOf('-') > 0) {
-        const lastPart = versionParts[versionParts.length - 1];
-        versionParts[versionParts.length - 1] = lastPart.split('-')[0].trim();
-        versionParts.push(lastPart.split('-')[1].trim());
-    }
-    while (versionParts.length < 4) {
-        versionParts.push('');
-    }
-    // Exclude PII from `version_info` to ensure we don't send this up via telemetry.
-    for (let index = 0; index < 3; index += 1) {
-        versionParts[index] = /^\d+$/.test(versionParts[index]) ? versionParts[index] : '0';
-    }
-    if (['alpha', 'beta', 'candidate', 'final'].indexOf(versionParts[3]) === -1) {
-        versionParts.pop();
-    }
-    const numberParts = `${versionParts[0]}.${versionParts[1]}.${versionParts[2]}`;
-    const rawVersion = versionParts.length === 4 ? `${numberParts}-${versionParts[3]}` : numberParts;
-    return new SemVer(rawVersion);
-}

src/client/telemetry/index.ts

@@ -24,7 +24,6 @@ import { ExportFormat } from '../datascience/export/types';
 import { DebugConfigurationType } from '../debugger/extension/types';
 import { ConsoleType, TriggerType } from '../debugger/types';
 import { LinterId } from '../linters/types';
-import { EnvironmentType } from '../pythonEnvironments/info';
 import { EventName, PlatformErrors } from './constants';
 import { LinterTrigger } from './types';
 
@@ -982,12 +981,6 @@ export interface IEventNamePropertyMapping {
          * @type {string}
          */
         pythonVersion?: string;
-        /**
-         * The type of the interpreter used
-         *
-         * @type {EnvironmentType}
-         */
-        interpreterType: EnvironmentType;
     };
     /**
      * Telemetry event sent when getting activation commands for terminal when interpreter is not specified
@@ -1011,12 +1004,6 @@ export interface IEventNamePropertyMapping {
          * @type {string}
          */
         pythonVersion?: string;
-        /**
-         * The type of the interpreter used
-         *
-         * @type {EnvironmentType}
-         */
-        interpreterType: EnvironmentType;
     };
     [EventName.PYTHON_INTERPRETER_AUTO_SELECTION]: {
         /**
@@ -1447,12 +1434,6 @@ export interface IEventNamePropertyMapping {
          * @type {string}
          */
         pythonVersion?: string;
-        /**
-         * The Python interpreter type: Conda, Virtualenv, Venv, Pipenv etc.
-         *
-         * @type {EnvironmentType}
-         */
-        interpreterType?: EnvironmentType;
     };
     /**
      * Telemetry sent when building workspace symbols

src/test/common.ts

@@ -275,7 +275,8 @@ export function isOs(...OSes: OSType[]): boolean {
     return true;
 }
 
-export function getOSType(platform: string = process.platform): OSType {
+export function getOSType(): OSType {
+    const platform: string = process.platform;
     if (/^win/.test(platform)) {
         return OSType.Windows;
     } else if (/^darwin/.test(platform)) {
@@ -685,8 +686,16 @@ export class TestEventHandler<T extends void | any = any> implements IDisposable
 export function createEventHandler<T, K extends keyof T>(
     obj: T,
     eventName: K,
-    dispoables: IDisposable[] = []
+    disposables: IDisposable[] = []
 ): T[K] extends Event<infer TArgs> ? TestEventHandler<TArgs> : TestEventHandler<void> {
     // tslint:disable-next-line: no-any
-    return new TestEventHandler(obj[eventName] as any, eventName as string, dispoables) as any;
+    return new TestEventHandler(obj[eventName] as any, eventName as string, disposables) as any;
+}
+
+export function arePathsSame(path1: string, path2: string) {
+    if (getOSType() === OSType.Windows) {
+        return path1.toLowerCase() === path2.toLowerCase();
+    } else {
+        return path1 === path2;
+    }
 }

src/test/common/process/pythonDaemon.functional.test.ts

@@ -25,8 +25,8 @@ import { IDisposable } from '../../../client/common/types';
 import { Architecture } from '../../../client/common/utils/platform';
 import { EXTENSION_ROOT_DIR } from '../../../client/constants';
 import { PythonVersionInfo } from '../../../client/pythonEnvironments/info';
-import { parsePythonVersion } from '../../../client/pythonEnvironments/info/pythonVersion';
 import { isPythonVersion, PYTHON_PATH } from '../../common';
+import { parsePythonVersion } from '../../interpreters/pythonVersion';
 import { createTemporaryFile } from '../../utils/fs';
 use(chaiPromised);
 

src/test/common/process/pythonDaemonPool.functional.test.ts

@@ -32,8 +32,8 @@ import { Architecture } from '../../../client/common/utils/platform';
 import { EXTENSION_ROOT_DIR } from '../../../client/constants';
 import { JupyterDaemonModule } from '../../../client/datascience/constants';
 import { PythonVersionInfo } from '../../../client/pythonEnvironments/info';
-import { parsePythonVersion } from '../../../client/pythonEnvironments/info/pythonVersion';
 import { isPythonVersion, PYTHON_PATH, waitForCondition } from '../../common';
+import { parsePythonVersion } from '../../interpreters/pythonVersion';
 import { createTemporaryFile } from '../../utils/fs';
 use(chaiPromised);
 

src/test/common/process/pythonExecutionFactory.unit.test.ts

@@ -26,22 +26,19 @@ import {
     IPythonExecutionService
 } from '../../../client/common/process/types';
 import { IConfigurationService, IDisposableRegistry } from '../../../client/common/types';
-import { Architecture } from '../../../client/common/utils/platform';
 import { IEnvironmentActivationService } from '../../../client/interpreter/activation/types';
 import { IInterpreterService } from '../../../client/interpreter/contracts';
 import { IWindowsStoreInterpreter } from '../../../client/interpreter/locators/types';
 import { ServiceContainer } from '../../../client/ioc/container';
-import { EnvironmentType, PythonEnvironment } from '../../../client/pythonEnvironments/info';
+import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 
 // tslint:disable:no-any max-func-body-length chai-vague-errors
 
 const pythonInterpreter: PythonEnvironment = {
     path: '/foo/bar/python.exe',
     version: new SemVer('3.6.6-final'),
     sysVersion: '1.0.0.0',
-    sysPrefix: 'Python',
-    envType: EnvironmentType.Unknown,
-    architecture: Architecture.x64
+    sysPrefix: 'Python'
 };
 
 function title(resource?: Uri, interpreter?: PythonEnvironment) {

src/test/datascience/commands/notebookCommands.functional.test.ts

@@ -30,7 +30,6 @@ import { IKernelFinder } from '../../../client/datascience/kernel-launcher/types
 import { NativeEditorProvider } from '../../../client/datascience/notebookStorage/nativeEditorProvider';
 import { IInteractiveWindowProvider, INotebookEditorProvider } from '../../../client/datascience/types';
 import { IInterpreterService } from '../../../client/interpreter/contracts';
-import { EnvironmentType } from '../../../client/pythonEnvironments/info';
 
 // tslint:disable: max-func-body-length no-any
 suite('DataScience - Notebook Commands', () => {
@@ -58,7 +57,6 @@ suite('DataScience - Notebook Commands', () => {
     };
     const selectedInterpreter = {
         path: '',
-        envType: EnvironmentType.Conda,
         architecture: Architecture.Unknown,
         sysPrefix: '',
         sysVersion: ''

src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts

@@ -14,9 +14,8 @@ import { PythonExecutionFactory } from '../../../client/common/process/pythonExe
 import { IPythonExecutionFactory, IPythonExecutionService } from '../../../client/common/process/types';
 import { IInstaller, Product } from '../../../client/common/types';
 import { Common, DataScience } from '../../../client/common/utils/localize';
-import { Architecture } from '../../../client/common/utils/platform';
 import { DataViewerDependencyService } from '../../../client/datascience/data-viewing/dataViewerDependencyService';
-import { EnvironmentType, PythonEnvironment } from '../../../client/pythonEnvironments/info';
+import { PythonEnvironment } from '../../../client/pythonEnvironments/info';
 
 suite('DataScience - DataViewerDependencyService', () => {
     let dependencyService: DataViewerDependencyService;
@@ -27,12 +26,10 @@ suite('DataScience - DataViewerDependencyService', () => {
     let pythonExecService: IPythonExecutionService;
     setup(async () => {
         interpreter = {
-            architecture: Architecture.Unknown,
             displayName: '',
             path: path.join('users', 'python', 'bin', 'python.exe'),
             sysPrefix: '',
             sysVersion: '',
-            envType: EnvironmentType.Unknown,
             version: new SemVer('3.3.3')
         };
         pythonExecService = mock<IPythonExecutionService>();

src/test/datascience/dataScienceIocContainer.ts

@@ -151,7 +151,6 @@ import {
 import { sleep } from '../../client/common/utils/async';
 import { noop } from '../../client/common/utils/misc';
 import { IMultiStepInputFactory, MultiStepInputFactory } from '../../client/common/utils/multiStepInput';
-import { Architecture } from '../../client/common/utils/platform';
 import { EnvironmentVariablesService } from '../../client/common/variables/environment';
 import { EnvironmentVariablesProvider } from '../../client/common/variables/environmentVariablesProvider';
 import { IEnvironmentVariablesProvider, IEnvironmentVariablesService } from '../../client/common/variables/types';
@@ -306,7 +305,7 @@ import {
 import { ProtocolParser } from '../../client/debugger/extension/helpers/protocolParser';
 import { IProtocolParser } from '../../client/debugger/extension/types';
 import { IInterpreterService } from '../../client/interpreter/contracts';
-import { EnvironmentType, PythonEnvironment } from '../../client/pythonEnvironments/info';
+import { PythonEnvironment } from '../../client/pythonEnvironments/info';
 import { CodeExecutionHelper } from '../../client/terminals/codeExecution/helper';
 import { ICodeExecutionHelper } from '../../client/terminals/types';
 import { MockOutputChannel } from '../mockClasses';
@@ -379,18 +378,14 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
         version: new SemVer('3.6.6-final'),
         sysVersion: '1.0.0.0',
         sysPrefix: 'Python',
-        displayName: 'Python',
-        envType: EnvironmentType.Unknown,
-        architecture: Architecture.x64
+        displayName: 'Python'
     };
     private workingPython2: PythonEnvironment = {
         path: '/foo/baz/python.exe',
         version: new SemVer('3.6.7-final'),
         sysVersion: '1.0.0.0',
         sysPrefix: 'Python',
-        displayName: 'Python',
-        envType: EnvironmentType.Unknown,
-        architecture: Architecture.x64
+        displayName: 'Python'
     };
 
     private webPanelProvider = mock(WebviewPanelProvider);