Remove old discovery code and discovery experiments (#17795)

* Remove code * Lint * Fix unit tests * Remove discovery experiments * Oops * Update settings.json * News entry * Disable windows store watcher tests * Disable global watchers * Remove Interpereter version service * Conda service is no longer legacy IOC * Move conda service to correct module
microsoft · Oct 20, 2021 · ff6a026 · ff6a026
1 parent 7f9b6e0
commit ff6a026
Show file tree

Hide file tree

Showing 89 changed files with 99 additions and 9,635 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -211,12 +211,6 @@ jobs:
           & $condaPythonPath ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} condaPath
           & $condaExecPath init --all
 
-          # 2. For `interpreterLocatorService.testvirtualenvs.ts`
-
-          & $condaExecPath create -n "test_env1" -y python
-          & $condaExecPath create -p "./test_env2" -y python
-          & $condaExecPath create -p "~/test_env3" -y python
-
       - name: Set CI_PYTHON_PATH and CI_DISABLE_AUTO_SELECTION
         run: |
           echo "CI_PYTHON_PATH=python" >> $GITHUB_ENV

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -191,12 +191,6 @@ jobs:
           & $condaPythonPath ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} condaPath
           & $condaExecPath init --all
 
-          # 2. For `interpreterLocatorService.testvirtualenvs.ts`
-
-          & $condaExecPath create -n "test_env1" -y python
-          & $condaExecPath create -p "./test_env2" -y python
-          & $condaExecPath create -p "~/test_env3" -y python
-
       - name: Set CI_PYTHON_PATH and CI_DISABLE_AUTO_SELECTION
         run: |
           echo "CI_PYTHON_PATH=python" >> $GITHUB_ENV
@@ -458,12 +452,6 @@ jobs:
           & $condaPythonPath ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} condaPath
           & $condaExecPath init --all
 
-          # 2. For `interpreterLocatorService.testvirtualenvs.ts`
-
-          & $condaExecPath create -n "test_env1" -y python
-          & $condaExecPath create -p "./test_env2" -y python
-          & $condaExecPath create -p "~/test_env3" -y python
-
       - name: Run TypeScript unit tests
         run: npm run test:unittests:cover
 

diff --git a/news/3 Code Health/17795.md b/news/3 Code Health/17795.md
@@ -0,0 +1 @@
+Remove old discovery code and discovery experiments.
diff --git a/package.json b/package.json
@@ -616,8 +616,6 @@
                         "enum": [
                             "All",
                             "pythonDeprecatePythonPath",
-                            "pythonDiscoveryModule",
-                            "pythonDiscoveryModuleWithoutWatcher",
                             "pythonSurveyNotification",
                             "pythonTensorboardExperiment",
                             "pythonRunFailedTestsButtonDisplayed",
@@ -635,8 +633,6 @@
                         "enum": [
                             "All",
                             "pythonDeprecatePythonPath",
-                            "pythonDiscoveryModule",
-                            "pythonDiscoveryModuleWithoutWatcher",
                             "pythonSurveyNotification",
                             "pythonTensorboardExperiment",
                             "pythonRunFailedTestsButtonDisplayed",

diff --git a/src/client/common/experiments/groups.ts b/src/client/common/experiments/groups.ts
@@ -22,12 +22,6 @@ export enum NativeTensorBoard {
     experiment = 'pythonTensorboardExperiment',
 }
 
-// Experiment to control which environment discovery mechanism can be used
-export enum DiscoveryVariants {
-    discoverWithFileWatching = 'pythonDiscoveryModule',
-    discoveryWithoutFileWatching = 'pythonDiscoveryModuleWithoutWatcher',
-}
-
 // 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

diff --git a/src/client/common/experiments/service.ts b/src/client/common/experiments/service.ts
@@ -12,7 +12,6 @@ import { IApplicationEnvironment, IWorkspaceService } from '../application/types
 import { PVSC_EXTENSION_ID, STANDARD_OUTPUT_CHANNEL } from '../constants';
 import { GLOBAL_MEMENTO, IExperimentService, IMemento, IOutputChannel } from '../types';
 import { Experiments } from '../utils/localize';
-import { DiscoveryVariants } from './groups';
 import { ExperimentationTelemetry } from './telemetry';
 
 const EXP_MEMENTO_KEY = 'VSCode.ABExp.FeatureData';
@@ -109,11 +108,6 @@ export class ExperimentService implements IExperimentService {
     }
 
     public inExperimentSync(experiment: string): boolean {
-        if (experiment === DiscoveryVariants.discoveryWithoutFileWatching) {
-            // Enable discovery experiment for all users.
-            return true;
-        }
-
         if (!this.experimentationService) {
             return false;
         }

diff --git a/src/client/common/terminal/environmentActivationProviders/baseActivationProvider.ts b/src/client/common/terminal/environmentActivationProviders/baseActivationProvider.ts
@@ -5,11 +5,44 @@ import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
 import { IServiceContainer } from '../../../ioc/types';
-import { getVenvExecutableFinder } from '../../../pythonEnvironments/discovery/subenv';
 import { IFileSystem } from '../../platform/types';
 import { IConfigurationService } from '../../types';
 import { ITerminalActivationCommandProvider, TerminalShellType } from '../types';
 
+type ExecutableFinderFunc = (python: string) => Promise<string | undefined>;
+
+/**
+ * Build an "executable finder" function that identifies venv environments.
+ *
+ * @param basename - the venv name or names to look for
+ * @param pathDirname - typically `path.dirname`
+ * @param pathJoin - typically `path.join`
+ * @param fileExists - typically `fs.exists`
+ */
+
+function getVenvExecutableFinder(
+    basename: string | string[],
+    // <path>
+    pathDirname: (filename: string) => string,
+    pathJoin: (...parts: string[]) => string,
+    // </path>
+    fileExists: (n: string) => Promise<boolean>,
+): ExecutableFinderFunc {
+    const basenames = typeof basename === 'string' ? [basename] : basename;
+    return async (python: string) => {
+        // Generated scripts are found in the same directory as the interpreter.
+        const binDir = pathDirname(python);
+        for (const name of basenames) {
+            const filename = pathJoin(binDir, name);
+            if (await fileExists(filename)) {
+                return filename;
+            }
+        }
+        // No matches so return undefined.
+        return undefined;
+    };
+}
+
 @injectable()
 abstract class BaseActivationCommandProvider implements ITerminalActivationCommandProvider {
     constructor(@inject(IServiceContainer) protected readonly serviceContainer: IServiceContainer) {}

diff --git a/src/client/interpreter/contracts.ts b/src/client/interpreter/contracts.ts
@@ -1,37 +1,12 @@
 import { SemVer } from 'semver';
 import { CodeLensProvider, ConfigurationTarget, Disposable, Event, TextDocument, Uri } from 'vscode';
-import { IExtensionSingleActivationService } from '../activation/types';
 import { FileChangeType } from '../common/platform/fileSystemWatcher';
 import { Resource } from '../common/types';
 import { PythonEnvSource } from '../pythonEnvironments/base/info';
 import { PythonLocatorQuery } from '../pythonEnvironments/base/locator';
-import { CondaEnvironmentInfo, CondaInfo } from '../pythonEnvironments/common/environmentManagers/conda';
+import { CondaEnvironmentInfo } from '../pythonEnvironments/common/environmentManagers/conda';
 import { EnvironmentType, PythonEnvironment } from '../pythonEnvironments/info';
 
-export const INTERPRETER_LOCATOR_SERVICE = 'IInterpreterLocatorService';
-export const WINDOWS_REGISTRY_SERVICE = 'WindowsRegistryService';
-export const CONDA_ENV_FILE_SERVICE = 'CondaEnvFileService';
-export const CONDA_ENV_SERVICE = 'CondaEnvService';
-export const CURRENT_PATH_SERVICE = 'CurrentPathService';
-export const KNOWN_PATH_SERVICE = 'KnownPathsService';
-export const GLOBAL_VIRTUAL_ENV_SERVICE = 'VirtualEnvService';
-export const WORKSPACE_VIRTUAL_ENV_SERVICE = 'WorkspaceVirtualEnvService';
-export const PIPENV_SERVICE = 'PipEnvService';
-export const IInterpreterVersionService = Symbol('IInterpreterVersionService');
-export interface IInterpreterVersionService {
-    getVersion(pythonPath: string, defaultValue: string): Promise<string>;
-    getPipVersion(pythonPath: string): Promise<string>;
-}
-
-export const IKnownSearchPathsForInterpreters = Symbol('IKnownSearchPathsForInterpreters');
-export interface IKnownSearchPathsForInterpreters {
-    getSearchPaths(): string[];
-}
-export const IVirtualEnvironmentsSearchPathProvider = Symbol('IVirtualEnvironmentsSearchPathProvider');
-export interface IVirtualEnvironmentsSearchPathProvider {
-    getSearchPaths(resource?: Uri): Promise<string[]>;
-}
-
 export type PythonEnvironmentsChangedEvent = {
     type?: FileChangeType;
     resource?: Uri;
@@ -74,15 +49,6 @@ export interface IComponentAdapter {
     isWindowsStoreInterpreter(pythonPath: string): Promise<boolean>;
 }
 
-export const IInterpreterLocatorService = Symbol('IInterpreterLocatorService');
-
-export interface IInterpreterLocatorService extends Disposable {
-    readonly onLocating: Event<Promise<PythonEnvironment[]>>;
-    readonly hasInterpreters: Promise<boolean>;
-    didTriggerInterpreterSuggestions?: boolean;
-    getInterpreters(resource?: Uri, options?: GetInterpreterOptions): Promise<PythonEnvironment[]>;
-}
-
 export const ICondaService = Symbol('ICondaService');
 /**
  * Interface carries the properties which are not available via the discovery component interface.
@@ -94,20 +60,6 @@ export interface ICondaService {
     getCondaFileFromInterpreter(interpreterPath?: string, envName?: string): Promise<string | undefined>;
 }
 
-export const ICondaLocatorService = Symbol('ICondaLocatorService');
-/**
- * @deprecated Use the new discovery component when in experiment, use this otherwise.
- */
-export interface ICondaLocatorService {
-    readonly condaEnvironmentsFile: string | undefined;
-    getCondaFile(): Promise<string>;
-    getCondaInfo(): Promise<CondaInfo | undefined>;
-    getCondaEnvironments(ignoreCache: boolean): Promise<CondaEnvironmentInfo[] | undefined>;
-    getInterpreterPath(condaEnvironmentPath: string): string;
-    isCondaEnvironment(interpreterPath: string): Promise<boolean>;
-    getCondaEnvironment(interpreterPath: string): Promise<CondaEnvironmentInfo | undefined>;
-}
-
 export const IInterpreterService = Symbol('IInterpreterService');
 export interface IInterpreterService {
     readonly onRefreshStart: Event<void>;
@@ -119,7 +71,7 @@ export interface IInterpreterService {
     onDidChangeInterpreterInformation: Event<PythonEnvironment>;
     hasInterpreters(filter?: (e: PythonEnvironment) => Promise<boolean>): Promise<boolean>;
     getInterpreters(resource?: Uri): PythonEnvironment[];
-    getAllInterpreters(resource?: Uri, options?: GetInterpreterOptions): Promise<PythonEnvironment[]>;
+    getAllInterpreters(resource?: Uri): Promise<PythonEnvironment[]>;
     getActiveInterpreter(resource?: Uri): Promise<PythonEnvironment | undefined>;
     getInterpreterDetails(pythonPath: string, resoure?: Uri): Promise<undefined | PythonEnvironment>;
     refresh(resource: Resource): Promise<void>;
@@ -146,33 +98,6 @@ export interface IInterpreterHelper {
     getBestInterpreter(interpreters?: PythonEnvironment[]): PythonEnvironment | undefined;
 }
 
-export const IPipEnvService = Symbol('IPipEnvService');
-export interface IPipEnvService extends IInterpreterLocatorService {
-    executable: string;
-    isRelatedPipEnvironment(dir: string, pythonPath: string): Promise<boolean>;
-}
-
-export const IInterpreterLocatorHelper = Symbol('IInterpreterLocatorHelper');
-export interface IInterpreterLocatorHelper {
-    mergeInterpreters(interpreters: PythonEnvironment[]): Promise<PythonEnvironment[]>;
-}
-
-export const IInterpreterWatcher = Symbol('IInterpreterWatcher');
-export interface IInterpreterWatcher {
-    onDidCreate: Event<Resource>;
-}
-
-export const IInterpreterWatcherBuilder = Symbol('IInterpreterWatcherBuilder');
-export interface IInterpreterWatcherBuilder {
-    getWorkspaceVirtualEnvInterpreterWatcher(resource: Resource): Promise<IInterpreterWatcher>;
-}
-
-export const IInterpreterLocatorProgressService = Symbol('IInterpreterLocatorProgressService');
-export interface IInterpreterLocatorProgressService extends IExtensionSingleActivationService {
-    readonly onRefreshing: Event<void>;
-    readonly onRefreshed: Event<void>;
-}
-
 export const IInterpreterStatusbarVisibilityFilter = Symbol('IInterpreterStatusbarVisibilityFilter');
 /**
  * Implement this interface to control the visibility of the interpreter statusbar.
@@ -186,5 +111,3 @@ export type WorkspacePythonPath = {
     folderUri: Uri;
     configTarget: ConfigurationTarget.Workspace | ConfigurationTarget.WorkspaceFolder;
 };
-
-export type GetInterpreterOptions = { ignoreCache?: boolean; onSuggestion?: boolean };
diff --git a/src/client/interpreter/interpreterVersion.ts b/src/client/interpreter/interpreterVersion.ts
diff --git a/src/client/interpreter/serviceRegistry.ts b/src/client/interpreter/serviceRegistry.ts
@@ -23,19 +23,12 @@ import {
     IPythonPathUpdaterServiceFactory,
     IPythonPathUpdaterServiceManager,
 } from './configuration/types';
-import {
-    IInterpreterDisplay,
-    IInterpreterHelper,
-    IInterpreterService,
-    IInterpreterVersionService,
-    IShebangCodeLensProvider,
-} from './contracts';
+import { IInterpreterDisplay, IInterpreterHelper, IInterpreterService, IShebangCodeLensProvider } from './contracts';
 import { InterpreterDisplay } from './display';
 import { InterpreterLocatorProgressStatubarHandler } from './display/progressDisplay';
 import { ShebangCodeLensProvider } from './display/shebangCodeLensProvider';
 import { InterpreterHelper } from './helpers';
 import { InterpreterService } from './interpreterService';
-import { InterpreterVersionService } from './interpreterVersion';
 import { CondaInheritEnvPrompt } from './virtualEnvs/condaInheritEnvPrompt';
 import { VirtualEnvironmentPrompt } from './virtualEnvs/virtualEnvPrompt';
 
@@ -62,8 +55,6 @@ export function registerInterpreterTypes(serviceManager: IServiceManager): void
 
     serviceManager.addSingleton<IExtensionActivationService>(IExtensionActivationService, VirtualEnvironmentPrompt);
 
-    serviceManager.addSingleton<IInterpreterVersionService>(IInterpreterVersionService, InterpreterVersionService);
-
     serviceManager.addSingleton<IInterpreterService>(IInterpreterService, InterpreterService);
     serviceManager.addSingleton<IInterpreterDisplay>(IInterpreterDisplay, InterpreterDisplay);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove old discovery code and discovery experiments.