Cleanup PythonPath related objects

src/client/common/experiments/groups.ts

@@ -2,15 +2,3 @@
 export enum ShowExtensionSurveyPrompt {
     experiment = 'pythonSurveyNotification',
 }
-
-// Feature flag for 'Python: Launch TensorBoard' feature
-export enum NativeTensorBoard {
-    experiment = 'pythonTensorboardExperiment',
-}
-
-// Feature gate to control whether we install the PyTorch profiler package
-// torch.profiler release is being delayed till end of March. This allows us
-// to turn on the profiler plugin install functionality between releases
-export enum TorchProfiler {
-    experiment = 'PythonPyTorchProfiler',
-}

src/client/interpreter/configuration/pythonPathUpdaterService.ts

@@ -32,7 +32,7 @@ export class PythonPathUpdaterService implements IPythonPathUpdaterServiceManage
             failed = true;
 
             const message = reason && typeof reason.message === 'string' ? (reason.message as string) : '';
-            window.showErrorMessage(`Failed to set 'pythonPath'. Error: ${message}`);
+            window.showErrorMessage(`Failed to set interpreter path. Error: ${message}`);
             traceError(reason);
         }
         // do not wait for this to complete

src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as TypeMoq from 'typemoq';
-import { ConfigurationTarget, Uri, WorkspaceConfiguration } from 'vscode';
+import { ConfigurationTarget, Uri } from 'vscode';
 import { IWorkspaceService } from '../../client/common/application/types';
 import { IExperimentService, IInterpreterPathService } from '../../client/common/types';
 import { PythonPathUpdaterServiceFactory } from '../../client/interpreter/configuration/pythonPathUpdaterServiceFactory';
@@ -28,13 +28,6 @@ suite('Python Path Settings Updater', () => {
             .returns(() => interpreterPathService.object);
         updaterServiceFactory = new PythonPathUpdaterServiceFactory(serviceContainer.object);
     }
-    function setupConfigProvider(resource?: Uri): TypeMoq.IMock<WorkspaceConfiguration> {
-        const workspaceConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
-        workspaceService
-            .setup((w) => w.getConfiguration(TypeMoq.It.isValue('python'), TypeMoq.It.isValue(resource)))
-            .returns(() => workspaceConfig.object);
-        return workspaceConfig;
-    }
 
     suite('Global', () => {
         setup(() => setupMocks());
@@ -106,8 +99,6 @@ suite('Python Path Settings Updater', () => {
             const workspaceFolder = Uri.file(workspaceFolderPath);
             const pythonPath = Uri.file(path.join(workspaceFolderPath, 'env', 'bin', 'python')).fsPath;
             const expectedPythonPath = path.join('env', 'bin', 'python');
-            const workspaceConfig = setupConfigProvider(workspaceFolder);
-            workspaceConfig.setup((w) => w.inspect(TypeMoq.It.isValue('pythonPath'))).returns(() => undefined);
             interpreterPathService.setup((i) => i.inspect(workspaceFolder)).returns(() => ({}));
             interpreterPathService
                 .setup((i) => i.update(workspaceFolder, ConfigurationTarget.WorkspaceFolder, expectedPythonPath))

src/test/mocks/mockWorkspaceConfig.ts

@@ -24,11 +24,6 @@ export class MockWorkspaceConfiguration implements WorkspaceConfiguration {
             const keys = [...Object.keys(defaultSettings)];
             keys.forEach((k) => this.values.set(k, defaultSettings[k]));
         }
-
-        // Special case python path (not in the object)
-        if (defaultSettings && defaultSettings.pythonPath) {
-            this.values.set('pythonPath', defaultSettings.pythonPath);
-        }
     }
 
     public get<T>(key: string, defaultValue?: T): T | undefined {