diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts index fb1e2b31ed58..cacc74ddd577 100644 --- a/src/client/activation/activationService.ts +++ b/src/client/activation/activationService.ts @@ -24,7 +24,7 @@ import { swallowExceptions } from '../common/utils/decorators'; import { noop } from '../common/utils/misc'; import { IInterpreterService } from '../interpreter/contracts'; import { IServiceContainer } from '../ioc/types'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { sendTelemetryEvent } from '../telemetry'; import { EventName } from '../telemetry/constants'; import { Commands } from './languageServer/constants'; diff --git a/src/client/activation/common/activatorBase.ts b/src/client/activation/common/activatorBase.ts index d909b0da0f4d..cc4b229fa81e 100644 --- a/src/client/activation/common/activatorBase.ts +++ b/src/client/activation/common/activatorBase.ts @@ -30,7 +30,7 @@ import { traceDecorators } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IConfigurationService, Resource } from '../../common/types'; import { EXTENSION_ROOT_DIR } from '../../constants'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { ILanguageServerActivator, ILanguageServerDownloader, diff --git a/src/client/activation/common/analysisOptions.ts b/src/client/activation/common/analysisOptions.ts index 75c11c87a064..3c36523e63b6 100644 --- a/src/client/activation/common/analysisOptions.ts +++ b/src/client/activation/common/analysisOptions.ts @@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger'; import { IOutputChannel, Resource } from '../../common/types'; import { debounceSync } from '../../common/utils/decorators'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { ILanguageServerAnalysisOptions, ILanguageServerOutputChannel } from '../types'; @injectable() diff --git a/src/client/activation/jedi.ts b/src/client/activation/jedi.ts index 83ca29551a11..69259b62191a 100644 --- a/src/client/activation/jedi.ts +++ b/src/client/activation/jedi.ts @@ -39,7 +39,7 @@ import { PythonReferenceProvider } from '../providers/referenceProvider'; import { PythonRenameProvider } from '../providers/renameProvider'; import { PythonSignatureProvider } from '../providers/signatureProvider'; import { JediSymbolProvider } from '../providers/symbolProvider'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { ITestManagementService } from '../testing/types'; import { BlockFormatProviders } from '../typeFormatters/blockFormatProvider'; import { OnTypeFormattingDispatcher } from '../typeFormatters/dispatcher'; diff --git a/src/client/activation/languageServer/analysisOptions.ts b/src/client/activation/languageServer/analysisOptions.ts index 8033e221746b..7899f2f17591 100644 --- a/src/client/activation/languageServer/analysisOptions.ts +++ b/src/client/activation/languageServer/analysisOptions.ts @@ -10,7 +10,7 @@ import { traceDecorators, traceError } from '../../common/logger'; import { IConfigurationService, IExtensionContext, IPathUtils, Resource } from '../../common/types'; import { debounceSync } from '../../common/utils/decorators'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { LanguageServerAnalysisOptionsBase } from '../common/analysisOptions'; import { ILanguageServerFolderService, ILanguageServerOutputChannel } from '../types'; diff --git a/src/client/activation/languageServer/languageClientFactory.ts b/src/client/activation/languageServer/languageClientFactory.ts index 1267605d89bf..59fd97d2a4aa 100644 --- a/src/client/activation/languageServer/languageClientFactory.ts +++ b/src/client/activation/languageServer/languageClientFactory.ts @@ -9,7 +9,7 @@ import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants'; import { IConfigurationService, Resource } from '../../common/types'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; import { IEnvironmentActivationService } from '../../interpreter/activation/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { ILanguageClientFactory, ILanguageServerFolderService, IPlatformData } from '../types'; // tslint:disable:no-require-imports no-require-imports no-var-requires max-classes-per-file diff --git a/src/client/activation/languageServer/languageServerProxy.ts b/src/client/activation/languageServer/languageServerProxy.ts index c8991a1a37a1..64296c1f08dd 100644 --- a/src/client/activation/languageServer/languageServerProxy.ts +++ b/src/client/activation/languageServer/languageServerProxy.ts @@ -11,7 +11,7 @@ import { createDeferred, Deferred, sleep } from '../../common/utils/async'; import { swallowExceptions } from '../../common/utils/decorators'; import { noop } from '../../common/utils/misc'; import { LanguageServerSymbolProvider } from '../../providers/symbolProvider'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { ITestManagementService } from '../../testing/types'; diff --git a/src/client/activation/languageServer/manager.ts b/src/client/activation/languageServer/manager.ts index 562e22ebf0fb..282dd537e6da 100644 --- a/src/client/activation/languageServer/manager.ts +++ b/src/client/activation/languageServer/manager.ts @@ -15,7 +15,7 @@ import { } from '../../common/types'; import { debounceSync } from '../../common/utils/decorators'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { LanguageClientMiddleware } from '../languageClientMiddleware'; diff --git a/src/client/activation/node/languageClientFactory.ts b/src/client/activation/node/languageClientFactory.ts index a8d9cbdab41d..a8e666c59d26 100644 --- a/src/client/activation/node/languageClientFactory.ts +++ b/src/client/activation/node/languageClientFactory.ts @@ -8,7 +8,7 @@ import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } f import { EXTENSION_ROOT_DIR, PYTHON_LANGUAGE } from '../../common/constants'; import { IFileSystem } from '../../common/platform/types'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { ILanguageClientFactory, ILanguageServerFolderService } from '../types'; import { FileBasedCancellationStrategy } from './cancellationUtils'; diff --git a/src/client/activation/node/languageServerProxy.ts b/src/client/activation/node/languageServerProxy.ts index 971d128480aa..027df77f82e4 100644 --- a/src/client/activation/node/languageServerProxy.ts +++ b/src/client/activation/node/languageServerProxy.ts @@ -17,7 +17,7 @@ import { createDeferred, Deferred, sleep } from '../../common/utils/async'; import { swallowExceptions } from '../../common/utils/decorators'; import { noop } from '../../common/utils/misc'; import { LanguageServerSymbolProvider } from '../../providers/symbolProvider'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { ITestManagementService } from '../../testing/types'; diff --git a/src/client/activation/node/manager.ts b/src/client/activation/node/manager.ts index 723fa1baba6b..a9f39d845fb1 100644 --- a/src/client/activation/node/manager.ts +++ b/src/client/activation/node/manager.ts @@ -15,7 +15,7 @@ import { } from '../../common/types'; import { debounceSync } from '../../common/utils/decorators'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { LanguageClientMiddleware } from '../languageClientMiddleware'; diff --git a/src/client/activation/none/activator.ts b/src/client/activation/none/activator.ts index 9748922e16cc..8d808ae87ce0 100644 --- a/src/client/activation/none/activator.ts +++ b/src/client/activation/none/activator.ts @@ -21,7 +21,7 @@ import { WorkspaceEdit } from 'vscode'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { ILanguageServerActivator } from '../types'; /** diff --git a/src/client/activation/refCountedLanguageServer.ts b/src/client/activation/refCountedLanguageServer.ts index 0ef248eaf6be..e2bc6c833af0 100644 --- a/src/client/activation/refCountedLanguageServer.ts +++ b/src/client/activation/refCountedLanguageServer.ts @@ -23,7 +23,7 @@ import { import { Resource } from '../common/types'; import { noop } from '../common/utils/misc'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { ILanguageServerActivator, LanguageServerType } from './types'; export class RefCountedLanguageServer implements ILanguageServerActivator { diff --git a/src/client/activation/types.ts b/src/client/activation/types.ts index f30a9d0f8749..6d4901c7b81e 100644 --- a/src/client/activation/types.ts +++ b/src/client/activation/types.ts @@ -20,7 +20,7 @@ import { import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient'; import { NugetPackage } from '../common/nuget/types'; import { IDisposable, IOutputChannel, LanguageServerDownloadChannels, Resource } from '../common/types'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; export const IExtensionActivationManager = Symbol('IExtensionActivationManager'); /** diff --git a/src/client/application/diagnostics/checks/macPythonInterpreter.ts b/src/client/application/diagnostics/checks/macPythonInterpreter.ts index a41a1acbe670..46933e4ae8f6 100644 --- a/src/client/application/diagnostics/checks/macPythonInterpreter.ts +++ b/src/client/application/diagnostics/checks/macPythonInterpreter.ts @@ -19,7 +19,7 @@ import { } from '../../../common/types'; import { IInterpreterHelper, IInterpreterService } from '../../../interpreter/contracts'; import { IServiceContainer } from '../../../ioc/types'; -import { InterpreterType } from '../../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../pythonEnvironments/info'; import { BaseDiagnostic, BaseDiagnosticsService } from '../base'; import { IDiagnosticsCommandFactory } from '../commands/types'; import { DiagnosticCodes } from '../constants'; diff --git a/src/client/common/installer/channelManager.ts b/src/client/common/installer/channelManager.ts index 97d72e7f6566..de57f4dbbe56 100644 --- a/src/client/common/installer/channelManager.ts +++ b/src/client/common/installer/channelManager.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { Uri } from 'vscode'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; import { IApplicationShell } from '../application/types'; import { IPlatformService } from '../platform/types'; import { Product } from '../types'; diff --git a/src/client/common/installer/moduleInstaller.ts b/src/client/common/installer/moduleInstaller.ts index a9014041bfdf..c88aa9774cc7 100644 --- a/src/client/common/installer/moduleInstaller.ts +++ b/src/client/common/installer/moduleInstaller.ts @@ -6,7 +6,7 @@ import * as path from 'path'; import { CancellationToken, OutputChannel, ProgressLocation, ProgressOptions } from 'vscode'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IApplicationShell } from '../application/types'; diff --git a/src/client/common/installer/pipEnvInstaller.ts b/src/client/common/installer/pipEnvInstaller.ts index 841c1a0d54ea..f57ed06d9cd8 100644 --- a/src/client/common/installer/pipEnvInstaller.ts +++ b/src/client/common/installer/pipEnvInstaller.ts @@ -4,7 +4,7 @@ import { inject, injectable } from 'inversify'; import { IInterpreterLocatorService, PIPENV_SERVICE } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; import { ExecutionInfo } from '../types'; import { isResource } from '../utils/misc'; import { ModuleInstaller } from './moduleInstaller'; diff --git a/src/client/common/installer/productInstaller.ts b/src/client/common/installer/productInstaller.ts index 8fd307edf295..774ce9607f00 100644 --- a/src/client/common/installer/productInstaller.ts +++ b/src/client/common/installer/productInstaller.ts @@ -9,7 +9,7 @@ import { Telemetry } from '../../datascience/constants'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; import { LinterId } from '../../linters/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IApplicationShell, ICommandManager, IWorkspaceService } from '../application/types'; diff --git a/src/client/common/installer/types.ts b/src/client/common/installer/types.ts index 5d8fafb6ef9c..5fa410d96853 100644 --- a/src/client/common/installer/types.ts +++ b/src/client/common/installer/types.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import { CancellationToken, Uri } from 'vscode'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { Product, ProductType, Resource } from '../types'; export type InterpreterUri = Resource | PythonInterpreter; diff --git a/src/client/common/process/pythonDaemon.ts b/src/client/common/process/pythonDaemon.ts index f83f2567aacd..46e8f966a855 100644 --- a/src/client/common/process/pythonDaemon.ts +++ b/src/client/common/process/pythonDaemon.ts @@ -5,9 +5,9 @@ import { ChildProcess } from 'child_process'; import { MessageConnection, RequestType, RequestType0 } from 'vscode-jsonrpc'; -import { InterpreterInformation } from '../../pythonEnvironments/discovery/types'; import { PythonExecInfo } from '../../pythonEnvironments/exec'; -import { extractInterpreterInfo } from '../../pythonEnvironments/info'; +import { InterpreterInformation } from '../../pythonEnvironments/info'; +import { extractInterpreterInfo } from '../../pythonEnvironments/info/interpreter'; import { traceWarning } from '../logger'; import { BasePythonDaemon } from './baseDaemon'; import { PythonEnvInfo } from './internal/scripts'; diff --git a/src/client/common/process/pythonDaemonPool.ts b/src/client/common/process/pythonDaemonPool.ts index b11f9e869ca5..204c9ab33961 100644 --- a/src/client/common/process/pythonDaemonPool.ts +++ b/src/client/common/process/pythonDaemonPool.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -import { InterpreterInformation } from '../../pythonEnvironments/discovery/types'; import { PythonExecInfo } from '../../pythonEnvironments/exec'; +import { InterpreterInformation } from '../../pythonEnvironments/info'; import { IDisposableRegistry } from '../types'; import { sleep } from '../utils/async'; import { noop } from '../utils/misc'; diff --git a/src/client/common/process/pythonEnvironment.ts b/src/client/common/process/pythonEnvironment.ts index 09b917c8af7b..1ad1aca1cd93 100644 --- a/src/client/common/process/pythonEnvironment.ts +++ b/src/client/common/process/pythonEnvironment.ts @@ -2,9 +2,9 @@ // Licensed under the MIT License. import { CondaEnvironmentInfo } from '../../pythonEnvironments/discovery/locators/services/conda'; -import { InterpreterInformation } from '../../pythonEnvironments/discovery/types'; import { getPythonExecInfo, PythonExecInfo } from '../../pythonEnvironments/exec'; -import { extractInterpreterInfo } from '../../pythonEnvironments/info'; +import { InterpreterInformation } from '../../pythonEnvironments/info'; +import { extractInterpreterInfo } from '../../pythonEnvironments/info/interpreter'; import { traceError, traceInfo } from '../logger'; import { IFileSystem } from '../platform/types'; import * as internalPython from './internal/python'; diff --git a/src/client/common/process/types.ts b/src/client/common/process/types.ts index 8094d85a0200..3a1c8b75e3f0 100644 --- a/src/client/common/process/types.ts +++ b/src/client/common/process/types.ts @@ -6,8 +6,8 @@ import { Observable } from 'rxjs/Observable'; import { CancellationToken, Uri } from 'vscode'; import { Newable } from '../../ioc/types'; -import { InterpreterInformation, PythonInterpreter } from '../../pythonEnvironments/discovery/types'; import { PythonExecInfo } from '../../pythonEnvironments/exec'; +import { InterpreterInformation, PythonInterpreter } from '../../pythonEnvironments/info'; import { ExecutionInfo, IDisposable } from '../types'; import { EnvironmentVariables } from '../variables/types'; diff --git a/src/client/common/terminal/environmentActivationProviders/pipEnvActivationProvider.ts b/src/client/common/terminal/environmentActivationProviders/pipEnvActivationProvider.ts index c2ce11a89c24..be1f2bf9bd75 100644 --- a/src/client/common/terminal/environmentActivationProviders/pipEnvActivationProvider.ts +++ b/src/client/common/terminal/environmentActivationProviders/pipEnvActivationProvider.ts @@ -12,7 +12,7 @@ import { IPipEnvService, PIPENV_SERVICE } from '../../../interpreter/contracts'; -import { InterpreterType } from '../../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../pythonEnvironments/info'; import { IWorkspaceService } from '../../application/types'; import { IFileSystem } from '../../platform/types'; import { ITerminalActivationCommandProvider, TerminalShellType } from '../types'; diff --git a/src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts b/src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts index 7d9db9854035..f5b1ba3a6f4f 100644 --- a/src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts +++ b/src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts @@ -7,7 +7,7 @@ import { inject, injectable } from 'inversify'; import { Uri } from 'vscode'; import { IInterpreterService } from '../../../interpreter/contracts'; import { IServiceContainer } from '../../../ioc/types'; -import { InterpreterType } from '../../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../pythonEnvironments/info'; import { ITerminalActivationCommandProvider, TerminalShellType } from '../types'; @injectable() diff --git a/src/client/common/terminal/factory.ts b/src/client/common/terminal/factory.ts index 9b9390cb71cc..ba47a386765a 100644 --- a/src/client/common/terminal/factory.ts +++ b/src/client/common/terminal/factory.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { Uri } from 'vscode'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IWorkspaceService } from '../application/types'; import { IFileSystem } from '../platform/types'; import { isUri } from '../utils/misc'; diff --git a/src/client/common/terminal/helper.ts b/src/client/common/terminal/helper.ts index e5773e1362b0..ab6bd6cb1fb1 100644 --- a/src/client/common/terminal/helper.ts +++ b/src/client/common/terminal/helper.ts @@ -4,7 +4,7 @@ import { inject, injectable, multiInject, named } from 'inversify'; import { Terminal, Uri } from 'vscode'; import { ICondaService, IInterpreterService } from '../../interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { ITerminalManager } from '../application/types'; diff --git a/src/client/common/terminal/syncTerminalService.ts b/src/client/common/terminal/syncTerminalService.ts index 3d8782e9a08a..546ce3a4a223 100644 --- a/src/client/common/terminal/syncTerminalService.ts +++ b/src/client/common/terminal/syncTerminalService.ts @@ -6,7 +6,7 @@ import { inject } from 'inversify'; import { CancellationToken, Disposable, Event } from 'vscode'; import { IInterpreterService } from '../../interpreter/contracts'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { Cancellation } from '../cancellation'; import { traceVerbose } from '../logger'; import { IFileSystem, TemporaryFile } from '../platform/types'; diff --git a/src/client/common/terminal/types.ts b/src/client/common/terminal/types.ts index 389d349b4862..db5a0fe500da 100644 --- a/src/client/common/terminal/types.ts +++ b/src/client/common/terminal/types.ts @@ -4,7 +4,7 @@ 'use strict'; import { CancellationToken, Event, Terminal, Uri } from 'vscode'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IEventNamePropertyMapping } from '../../telemetry/index'; import { IDisposable, Resource } from '../types'; diff --git a/src/client/datascience/baseJupyterSession.ts b/src/client/datascience/baseJupyterSession.ts index 5e8eec8da212..13771a30a1c9 100644 --- a/src/client/datascience/baseJupyterSession.ts +++ b/src/client/datascience/baseJupyterSession.ts @@ -13,7 +13,7 @@ import { traceError, traceInfo, traceWarning } from '../common/logger'; import { waitForPromise } from '../common/utils/async'; import * as localize from '../common/utils/localize'; import { noop } from '../common/utils/misc'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { sendTelemetryEvent } from '../telemetry'; import { Telemetry } from './constants'; import { JupyterKernelPromiseFailedError } from './jupyter/kernels/jupyterKernelPromiseFailedError'; diff --git a/src/client/datascience/data-viewing/dataViewerDependencyService.ts b/src/client/datascience/data-viewing/dataViewerDependencyService.ts index e50e2fafd5da..4c122def7f62 100644 --- a/src/client/datascience/data-viewing/dataViewerDependencyService.ts +++ b/src/client/datascience/data-viewing/dataViewerDependencyService.ts @@ -12,7 +12,7 @@ import { traceWarning } from '../../common/logger'; import { IPythonExecutionFactory } from '../../common/process/types'; import { IInstaller, InstallerResponse, Product } from '../../common/types'; import { Common, DataScience } from '../../common/utils/localize'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { Telemetry } from '../constants'; diff --git a/src/client/datascience/interactive-common/intellisense/intellisenseProvider.ts b/src/client/datascience/interactive-common/intellisense/intellisenseProvider.ts index d8b9ee28f54d..6750bb17350a 100644 --- a/src/client/datascience/interactive-common/intellisense/intellisenseProvider.ts +++ b/src/client/datascience/interactive-common/intellisense/intellisenseProvider.ts @@ -30,7 +30,7 @@ import { createDeferred, Deferred, sleep, waitForPromise } from '../../../common import { noop } from '../../../common/utils/misc'; import { HiddenFileFormatString } from '../../../constants'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryWhenDone } from '../../../telemetry'; import { Identifiers, Settings, Telemetry } from '../../constants'; import { diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts index 6f81dddaccc5..65c869ad130d 100644 --- a/src/client/datascience/interactive-common/interactiveBase.ts +++ b/src/client/datascience/interactive-common/interactiveBase.ts @@ -43,7 +43,7 @@ import { createDeferred, Deferred } from '../../common/utils/async'; import * as localize from '../../common/utils/localize'; import { isUntitledFile, noop } from '../../common/utils/misc'; import { StopWatch } from '../../common/utils/stopWatch'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { generateCellRangesFromDocument } from '../cellFactory'; import { CellMatcher } from '../cellMatcher'; diff --git a/src/client/datascience/interactive-common/interactiveWindowTypes.ts b/src/client/datascience/interactive-common/interactiveWindowTypes.ts index 5ce69b39bad8..29de80b27841 100644 --- a/src/client/datascience/interactive-common/interactiveWindowTypes.ts +++ b/src/client/datascience/interactive-common/interactiveWindowTypes.ts @@ -16,7 +16,7 @@ import { NotifyIPyWidgeWidgetVersionNotSupportedAction } from '../../../datascience-ui/interactive-common/redux/reducers/types'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { NativeKeyboardCommandTelemetry, NativeMouseCommandTelemetry } from '../constants'; import { WidgetScriptSource } from '../ipywidgets/types'; import { LiveKernelModel } from '../jupyter/kernels/types'; diff --git a/src/client/datascience/interactive-ipynb/nativeEditor.ts b/src/client/datascience/interactive-ipynb/nativeEditor.ts index 141a52005684..7616b1f9c841 100644 --- a/src/client/datascience/interactive-ipynb/nativeEditor.ts +++ b/src/client/datascience/interactive-ipynb/nativeEditor.ts @@ -43,7 +43,7 @@ import { createDeferred, Deferred } from '../../common/utils/async'; import * as localize from '../../common/utils/localize'; import { StopWatch } from '../../common/utils/stopWatch'; import { EXTENSION_ROOT_DIR } from '../../constants'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { Commands, EditorContexts, Identifiers, Telemetry } from '../constants'; import { InteractiveBase } from '../interactive-common/interactiveBase'; diff --git a/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts b/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts index d170fa18a54e..ee976c3b19f7 100644 --- a/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts +++ b/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts @@ -10,7 +10,7 @@ import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { GLOBAL_MEMENTO, ICryptoUtils, IExtensionContext, IMemento, WORKSPACE_MEMENTO } from '../../common/types'; import { isUntitledFile, noop } from '../../common/utils/misc'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { Identifiers, KnownNotebookLanguages, Telemetry } from '../constants'; import { IEditorContentChange, NotebookModelChange } from '../interactive-common/interactiveWindowTypes'; import { InvalidNotebookFileError } from '../jupyter/invalidNotebookFileError'; diff --git a/src/client/datascience/interactive-window/interactiveWindow.ts b/src/client/datascience/interactive-window/interactiveWindow.ts index 4a9d70308f68..8971cffb0d51 100644 --- a/src/client/datascience/interactive-window/interactiveWindow.ts +++ b/src/client/datascience/interactive-window/interactiveWindow.ts @@ -30,7 +30,7 @@ import { } from '../../common/types'; import * as localize from '../../common/utils/localize'; import { EXTENSION_ROOT_DIR } from '../../constants'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { EditorContexts, Identifiers, Telemetry } from '../constants'; import { IDataViewerFactory } from '../data-viewing/types'; diff --git a/src/client/datascience/ipywidgets/ipyWidgetScriptSource.ts b/src/client/datascience/ipywidgets/ipyWidgetScriptSource.ts index 5ae4206c1a45..2bb6b9d1a4b1 100644 --- a/src/client/datascience/ipywidgets/ipyWidgetScriptSource.ts +++ b/src/client/datascience/ipywidgets/ipyWidgetScriptSource.ts @@ -21,7 +21,7 @@ import { import { createDeferred, Deferred } from '../../common/utils/async'; import { getOSType, OSType } from '../../common/utils/platform'; import { IInterpreterService } from '../../interpreter/contracts'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { Telemetry } from '../constants'; import { diff --git a/src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts b/src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts index 7ae23a462fc4..fcd5eeae628d 100644 --- a/src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts +++ b/src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts @@ -8,7 +8,7 @@ import { Uri } from 'vscode'; import { traceError } from '../../common/logger'; import { IFileSystem } from '../../common/platform/types'; import { IInterpreterService } from '../../interpreter/contracts'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { Telemetry } from '../constants'; import { ILocalResourceUriConverter, INotebook } from '../types'; diff --git a/src/client/datascience/jupyter/interpreter/jupyterCommand.ts b/src/client/datascience/jupyter/interpreter/jupyterCommand.ts index 580bf3daf621..e5e78b220c82 100644 --- a/src/client/datascience/jupyter/interpreter/jupyterCommand.ts +++ b/src/client/datascience/jupyter/interpreter/jupyterCommand.ts @@ -17,7 +17,7 @@ import { import { EXTENSION_ROOT_DIR } from '../../../constants'; import { IEnvironmentActivationService } from '../../../interpreter/activation/types'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { JupyterCommands, JupyterDaemonModule } from '../../constants'; import { IJupyterCommand, IJupyterCommandFactory } from '../../types'; diff --git a/src/client/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.ts b/src/client/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.ts index 0d76e78c3fef..7d7dfd479ef6 100644 --- a/src/client/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.ts +++ b/src/client/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.ts @@ -12,7 +12,7 @@ import { traceError } from '../../../common/logger'; import { IInstaller, InstallerResponse, Product } from '../../../common/types'; import { Common, DataScience } from '../../../common/utils/localize'; import { noop } from '../../../common/utils/misc'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../../telemetry'; import { HelpLinks, JupyterCommands, Telemetry } from '../../constants'; import { reportAction } from '../../progress/decorator'; diff --git a/src/client/datascience/jupyter/interpreter/jupyterInterpreterSelector.ts b/src/client/datascience/jupyter/interpreter/jupyterInterpreterSelector.ts index ccae8731e9d7..19e520d3298b 100644 --- a/src/client/datascience/jupyter/interpreter/jupyterInterpreterSelector.ts +++ b/src/client/datascience/jupyter/interpreter/jupyterInterpreterSelector.ts @@ -11,7 +11,7 @@ import { Cancellation } from '../../../common/cancellation'; import { IPathUtils } from '../../../common/types'; import { DataScience } from '../../../common/utils/localize'; import { IInterpreterSelector } from '../../../interpreter/configuration/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { JupyterInterpreterStateStore } from './jupyterInterpreterStateStore'; /** diff --git a/src/client/datascience/jupyter/interpreter/jupyterInterpreterService.ts b/src/client/datascience/jupyter/interpreter/jupyterInterpreterService.ts index e58285fdd5a4..8b330e3c7aac 100644 --- a/src/client/datascience/jupyter/interpreter/jupyterInterpreterService.ts +++ b/src/client/datascience/jupyter/interpreter/jupyterInterpreterService.ts @@ -10,7 +10,7 @@ import { createPromiseFromCancellation } from '../../../common/cancellation'; import '../../../common/extensions'; import { noop } from '../../../common/utils/misc'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../../telemetry'; import { Telemetry } from '../../constants'; import { JupyterInstallError } from '../jupyterInstallError'; diff --git a/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts b/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts index 3ceb8c306f7b..8e9a99df57b2 100644 --- a/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts +++ b/src/client/datascience/jupyter/interpreter/jupyterInterpreterSubCommandExecutionService.ts @@ -20,7 +20,7 @@ import { DataScience } from '../../../common/utils/localize'; import { noop } from '../../../common/utils/misc'; import { EXTENSION_ROOT_DIR } from '../../../constants'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../../telemetry'; import { JUPYTER_OUTPUT_CHANNEL, JupyterDaemonModule, Telemetry } from '../../constants'; import { reportAction } from '../../progress/decorator'; diff --git a/src/client/datascience/jupyter/jupyterExecution.ts b/src/client/datascience/jupyter/jupyterExecution.ts index b120e4587dda..cbfface0cf62 100644 --- a/src/client/datascience/jupyter/jupyterExecution.ts +++ b/src/client/datascience/jupyter/jupyterExecution.ts @@ -14,7 +14,7 @@ import { noop } from '../../common/utils/misc'; import { StopWatch } from '../../common/utils/stopWatch'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { JupyterSessionStartError } from '../baseJupyterSession'; import { Commands, Telemetry } from '../constants'; diff --git a/src/client/datascience/jupyter/jupyterExecutionFactory.ts b/src/client/datascience/jupyter/jupyterExecutionFactory.ts index 1d16e3253bf2..26f9a61edd88 100644 --- a/src/client/datascience/jupyter/jupyterExecutionFactory.ts +++ b/src/client/datascience/jupyter/jupyterExecutionFactory.ts @@ -15,7 +15,7 @@ import { } from '../../common/types'; import { IInterpreterService } from '../../interpreter/contracts'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { JUPYTER_OUTPUT_CHANNEL } from '../constants'; import { IJupyterExecution, INotebookServer, INotebookServerOptions } from '../types'; import { KernelSelector } from './kernels/kernelSelector'; diff --git a/src/client/datascience/jupyter/jupyterNotebook.ts b/src/client/datascience/jupyter/jupyterNotebook.ts index 57d00e851144..c55e45929e67 100644 --- a/src/client/datascience/jupyter/jupyterNotebook.ts +++ b/src/client/datascience/jupyter/jupyterNotebook.ts @@ -19,7 +19,7 @@ import { createDeferred, Deferred, waitForPromise } from '../../common/utils/asy import * as localize from '../../common/utils/localize'; import { noop } from '../../common/utils/misc'; import { StopWatch } from '../../common/utils/stopWatch'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { generateCells } from '../cellFactory'; import { CellMatcher } from '../cellMatcher'; diff --git a/src/client/datascience/jupyter/jupyterSession.ts b/src/client/datascience/jupyter/jupyterSession.ts index 851bc796f8f3..6cdc031841ca 100644 --- a/src/client/datascience/jupyter/jupyterSession.ts +++ b/src/client/datascience/jupyter/jupyterSession.ts @@ -21,7 +21,7 @@ import { IOutputChannel } from '../../common/types'; import { sleep } from '../../common/utils/async'; import * as localize from '../../common/utils/localize'; import { noop } from '../../common/utils/misc'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { BaseJupyterSession, JupyterSessionStartError } from '../baseJupyterSession'; import { Identifiers, Telemetry } from '../constants'; diff --git a/src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts b/src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts index 55fe0c31c311..2232b734a28b 100644 --- a/src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts +++ b/src/client/datascience/jupyter/kernels/jupyterKernelSpec.ts @@ -7,7 +7,7 @@ import { CancellationToken } from 'vscode'; import { createPromiseFromCancellation } from '../../../common/cancellation'; import { traceInfo } from '../../../common/logger'; import { IFileSystem } from '../../../common/platform/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IJupyterKernelSpec } from '../../types'; export class JupyterKernelSpec implements IJupyterKernelSpec { diff --git a/src/client/datascience/jupyter/kernels/kernelDependencyService.ts b/src/client/datascience/jupyter/kernels/kernelDependencyService.ts index ebb0a16c9ebb..47b00676f6cb 100644 --- a/src/client/datascience/jupyter/kernels/kernelDependencyService.ts +++ b/src/client/datascience/jupyter/kernels/kernelDependencyService.ts @@ -10,7 +10,7 @@ import { createPromiseFromCancellation, wrapCancellationTokens } from '../../../ import { ProductNames } from '../../../common/installer/productNames'; import { IInstaller, InstallerResponse, Product } from '../../../common/types'; import { Common, DataScience } from '../../../common/utils/localize'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IKernelDependencyService, KernelInterpreterDependencyResponse } from '../../types'; /** diff --git a/src/client/datascience/jupyter/kernels/kernelSelector.ts b/src/client/datascience/jupyter/kernels/kernelSelector.ts index b526f620bbc3..d0e4c10e59ac 100644 --- a/src/client/datascience/jupyter/kernels/kernelSelector.ts +++ b/src/client/datascience/jupyter/kernels/kernelSelector.ts @@ -14,7 +14,7 @@ import * as localize from '../../../common/utils/localize'; import { noop } from '../../../common/utils/misc'; import { StopWatch } from '../../../common/utils/stopWatch'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IEventNamePropertyMapping, sendTelemetryEvent } from '../../../telemetry'; import { KnownNotebookLanguages, Telemetry } from '../../constants'; import { IKernelFinder } from '../../kernel-launcher/types'; diff --git a/src/client/datascience/jupyter/kernels/kernelService.ts b/src/client/datascience/jupyter/kernels/kernelService.ts index bdcc78ee807b..2babf7909e54 100644 --- a/src/client/datascience/jupyter/kernels/kernelService.ts +++ b/src/client/datascience/jupyter/kernels/kernelService.ts @@ -20,7 +20,7 @@ import { sleep } from '../../../common/utils/async'; import { noop } from '../../../common/utils/misc'; import { IEnvironmentActivationService } from '../../../interpreter/activation/types'; import { IInterpreterService } from '../../../interpreter/contracts'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../../telemetry'; import { Telemetry } from '../../constants'; import { reportAction } from '../../progress/decorator'; diff --git a/src/client/datascience/jupyter/kernels/types.ts b/src/client/datascience/jupyter/kernels/types.ts index ebb486696d79..6134cb8b09ab 100644 --- a/src/client/datascience/jupyter/kernels/types.ts +++ b/src/client/datascience/jupyter/kernels/types.ts @@ -6,7 +6,7 @@ import type { Session } from '@jupyterlab/services'; import { CancellationToken, QuickPickItem } from 'vscode'; import { Resource } from '../../../common/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IJupyterKernel, IJupyterKernelSpec } from '../../types'; export type LiveKernelModel = IJupyterKernel & Partial & { session: Session.IModel }; diff --git a/src/client/datascience/jupyter/liveshare/guestJupyterExecution.ts b/src/client/datascience/jupyter/liveshare/guestJupyterExecution.ts index 6fd1cd290b9e..8c3398a2bef8 100644 --- a/src/client/datascience/jupyter/liveshare/guestJupyterExecution.ts +++ b/src/client/datascience/jupyter/liveshare/guestJupyterExecution.ts @@ -16,7 +16,7 @@ import { import * as localize from '../../../common/utils/localize'; import { IInterpreterService } from '../../../interpreter/contracts'; import { IServiceContainer } from '../../../ioc/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { LiveShare, LiveShareCommands } from '../../constants'; import { IJupyterConnection, INotebookServer, INotebookServerOptions } from '../../types'; import { JupyterConnectError } from '../jupyterConnectError'; diff --git a/src/client/datascience/jupyter/liveshare/guestJupyterNotebook.ts b/src/client/datascience/jupyter/liveshare/guestJupyterNotebook.ts index 65b0ec4e6cf7..c0ff67a12252 100644 --- a/src/client/datascience/jupyter/liveshare/guestJupyterNotebook.ts +++ b/src/client/datascience/jupyter/liveshare/guestJupyterNotebook.ts @@ -15,7 +15,7 @@ import { IConfigurationService, IDisposableRegistry, Resource } from '../../../c import { createDeferred } from '../../../common/utils/async'; import * as localize from '../../../common/utils/localize'; import { noop } from '../../../common/utils/misc'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { LiveShare, LiveShareCommands } from '../../constants'; import { ICell, diff --git a/src/client/datascience/jupyter/liveshare/hostJupyterServer.ts b/src/client/datascience/jupyter/liveshare/hostJupyterServer.ts index 0ad4a997de5a..fbdb4408f3d2 100644 --- a/src/client/datascience/jupyter/liveshare/hostJupyterServer.ts +++ b/src/client/datascience/jupyter/liveshare/hostJupyterServer.ts @@ -26,7 +26,7 @@ import { createDeferred } from '../../../common/utils/async'; import * as localize from '../../../common/utils/localize'; import { IInterpreterService } from '../../../interpreter/contracts'; import { IServiceContainer } from '../../../ioc/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { Identifiers, LiveShare, LiveShareCommands, RegExpValues } from '../../constants'; import { IDataScience, diff --git a/src/client/datascience/kernel-launcher/helpers.ts b/src/client/datascience/kernel-launcher/helpers.ts index 4762dea8cb52..d2bf2034d9a1 100644 --- a/src/client/datascience/kernel-launcher/helpers.ts +++ b/src/client/datascience/kernel-launcher/helpers.ts @@ -3,7 +3,7 @@ 'use strict'; import { IInterpreterService } from '../../interpreter/contracts'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IJupyterKernelSpec } from '../types'; // For a given IJupyterKernelSpec return the interpreter associated with it or error diff --git a/src/client/datascience/kernel-launcher/kernelDaemonPool.ts b/src/client/datascience/kernel-launcher/kernelDaemonPool.ts index a06298403253..b60f4de2176e 100644 --- a/src/client/datascience/kernel-launcher/kernelDaemonPool.ts +++ b/src/client/datascience/kernel-launcher/kernelDaemonPool.ts @@ -12,7 +12,7 @@ import { IDisposable, Resource } from '../../common/types'; import { noop } from '../../common/utils/misc'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; import { IInterpreterService } from '../../interpreter/contracts'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { KernelLauncherDaemonModule } from '../constants'; import { IJupyterKernelSpec, IKernelDependencyService } from '../types'; import { PythonKernelDaemon } from './kernelDaemon'; diff --git a/src/client/datascience/kernel-launcher/kernelLauncher.ts b/src/client/datascience/kernel-launcher/kernelLauncher.ts index f53639200574..0fbb0a298752 100644 --- a/src/client/datascience/kernel-launcher/kernelLauncher.ts +++ b/src/client/datascience/kernel-launcher/kernelLauncher.ts @@ -9,7 +9,7 @@ import * as uuid from 'uuid/v4'; import { IFileSystem } from '../../common/platform/types'; import { IProcessServiceFactory } from '../../common/process/types'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { Telemetry } from '../constants'; import { IJupyterKernelSpec } from '../types'; diff --git a/src/client/datascience/kernel-launcher/kernelLauncherDaemon.ts b/src/client/datascience/kernel-launcher/kernelLauncherDaemon.ts index d185436c60d3..588ae4c3f13e 100644 --- a/src/client/datascience/kernel-launcher/kernelLauncherDaemon.ts +++ b/src/client/datascience/kernel-launcher/kernelLauncherDaemon.ts @@ -9,7 +9,7 @@ import { IDisposable } from 'monaco-editor'; import { ObservableExecutionResult } from '../../common/process/types'; import { Resource } from '../../common/types'; import { noop } from '../../common/utils/misc'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IJupyterKernelSpec } from '../types'; import { KernelDaemonPool } from './kernelDaemonPool'; import { IPythonKernelDaemon } from './types'; diff --git a/src/client/datascience/kernel-launcher/kernelProcess.ts b/src/client/datascience/kernel-launcher/kernelProcess.ts index 01044b7c27d0..4232b99c90c3 100644 --- a/src/client/datascience/kernel-launcher/kernelProcess.ts +++ b/src/client/datascience/kernel-launcher/kernelProcess.ts @@ -11,7 +11,7 @@ import { traceError, traceInfo, traceWarning } from '../../common/logger'; import { IProcessServiceFactory, ObservableExecutionResult } from '../../common/process/types'; import { Resource } from '../../common/types'; import { noop, swallowExceptions } from '../../common/utils/misc'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { Telemetry } from '../constants'; import { cleanEnvironment, findIndexOfConnectionFile } from '../jupyter/kernels/helpers'; diff --git a/src/client/datascience/kernel-launcher/types.ts b/src/client/datascience/kernel-launcher/types.ts index 93298fbcac18..2fedfff8f5a6 100644 --- a/src/client/datascience/kernel-launcher/types.ts +++ b/src/client/datascience/kernel-launcher/types.ts @@ -8,7 +8,7 @@ import { CancellationToken, Event } from 'vscode'; import { InterpreterUri } from '../../common/installer/types'; import { ObservableExecutionResult } from '../../common/process/types'; import { IAsyncDisposable, IDisposable, Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IJupyterKernelSpec } from '../types'; export const IKernelLauncher = Symbol('IKernelLauncher'); diff --git a/src/client/datascience/raw-kernel/rawJupyterSession.ts b/src/client/datascience/raw-kernel/rawJupyterSession.ts index 3d0c39f84530..77cdf011e8ef 100644 --- a/src/client/datascience/raw-kernel/rawJupyterSession.ts +++ b/src/client/datascience/raw-kernel/rawJupyterSession.ts @@ -10,7 +10,7 @@ import { IDisposable, IOutputChannel, Resource } from '../../common/types'; import { waitForPromise } from '../../common/utils/async'; import * as localize from '../../common/utils/localize'; import { noop } from '../../common/utils/misc'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { BaseJupyterSession } from '../baseJupyterSession'; import { Identifiers, Telemetry } from '../constants'; diff --git a/src/client/datascience/types.ts b/src/client/datascience/types.ts index c15b66ab476d..2f637594c9a3 100644 --- a/src/client/datascience/types.ts +++ b/src/client/datascience/types.ts @@ -28,7 +28,7 @@ import { ICommandManager, IDebugService } from '../common/application/types'; import { ExecutionResult, ObservableExecutionResult, SpawnOptions } from '../common/process/types'; import { IAsyncDisposable, IDataScienceSettings, IDisposable, Resource } from '../common/types'; import { StopWatch } from '../common/utils/stopWatch'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { JupyterCommands } from './constants'; import { IDataViewerDataProvider } from './data-viewing/types'; import { NotebookModelChange } from './interactive-common/interactiveWindowTypes'; diff --git a/src/client/interpreter/activation/service.ts b/src/client/interpreter/activation/service.ts index ac53be26d25a..3d32cf84ca61 100644 --- a/src/client/interpreter/activation/service.ts +++ b/src/client/interpreter/activation/service.ts @@ -17,7 +17,7 @@ import { sleep } from '../../common/utils/async'; import { InMemoryCache } from '../../common/utils/cacheUtils'; import { OSType } from '../../common/utils/platform'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IInterpreterService } from '../contracts'; diff --git a/src/client/interpreter/activation/terminalEnvironmentActivationService.ts b/src/client/interpreter/activation/terminalEnvironmentActivationService.ts index da1c4e937919..cf3a8363c9f1 100644 --- a/src/client/interpreter/activation/terminalEnvironmentActivationService.ts +++ b/src/client/interpreter/activation/terminalEnvironmentActivationService.ts @@ -11,7 +11,7 @@ import * as internalScripts from '../../common/process/internal/scripts'; import { ITerminalServiceFactory } from '../../common/terminal/types'; import { Resource } from '../../common/types'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IEnvironmentActivationService } from './types'; diff --git a/src/client/interpreter/activation/types.ts b/src/client/interpreter/activation/types.ts index 8a020bcf8e80..da9837d4071b 100644 --- a/src/client/interpreter/activation/types.ts +++ b/src/client/interpreter/activation/types.ts @@ -4,7 +4,7 @@ 'use strict'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; export const IEnvironmentActivationService = Symbol('IEnvironmentActivationService'); export interface IEnvironmentActivationService { diff --git a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts index f07763f8e859..2540a8164ba1 100644 --- a/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts +++ b/src/client/interpreter/activation/wrapperEnvironmentActivationService.ts @@ -18,7 +18,7 @@ import { } from '../../common/types'; import { createDeferredFromPromise } from '../../common/utils/async'; import { IEnvironmentVariablesProvider } from '../../common/variables/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IInterpreterService } from '../contracts'; diff --git a/src/client/interpreter/autoSelection/index.ts b/src/client/interpreter/autoSelection/index.ts index 90cad68c06b2..596d0a5962e5 100644 --- a/src/client/interpreter/autoSelection/index.ts +++ b/src/client/interpreter/autoSelection/index.ts @@ -11,7 +11,7 @@ import '../../common/extensions'; import { IFileSystem } from '../../common/platform/types'; import { IPersistentState, IPersistentStateFactory, Resource } from '../../common/types'; import { createDeferred, Deferred } from '../../common/utils/async'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { captureTelemetry, sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IInterpreterHelper } from '../contracts'; diff --git a/src/client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation.ts b/src/client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation.ts index f05af80792fb..359312ac6ca6 100644 --- a/src/client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation.ts +++ b/src/client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation.ts @@ -8,7 +8,7 @@ import { Uri } from 'vscode'; import { IApplicationShell } from '../../../common/application/types'; import { IBrowserService, Resource } from '../../../common/types'; import { Common, Interpreters } from '../../../common/utils/localize'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../../telemetry'; import { EventName } from '../../../telemetry/constants'; import { IInterpreterHelper } from '../../contracts'; diff --git a/src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService.ts b/src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService.ts index 01a03997261e..827390b40745 100644 --- a/src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService.ts +++ b/src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { Event, EventEmitter } from 'vscode'; import { Resource } from '../../../common/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IInterpreterEvaluation, IInterpreterSecurityService, IInterpreterSecurityStorage } from '../types'; @injectable() diff --git a/src/client/interpreter/autoSelection/proxy.ts b/src/client/interpreter/autoSelection/proxy.ts index 5af9cb8fb288..02806dccffbe 100644 --- a/src/client/interpreter/autoSelection/proxy.ts +++ b/src/client/interpreter/autoSelection/proxy.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { Event, EventEmitter, Uri } from 'vscode'; import { IAsyncDisposableRegistry, IDisposableRegistry, Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IInterpreterAutoSeletionProxyService } from './types'; @injectable() diff --git a/src/client/interpreter/autoSelection/rules/baseRule.ts b/src/client/interpreter/autoSelection/rules/baseRule.ts index 569833cfeb59..5a6c56abb08e 100644 --- a/src/client/interpreter/autoSelection/rules/baseRule.ts +++ b/src/client/interpreter/autoSelection/rules/baseRule.ts @@ -10,7 +10,7 @@ import { traceDecorators, traceVerbose } from '../../../common/logger'; import { IFileSystem } from '../../../common/platform/types'; import { IPersistentState, IPersistentStateFactory, Resource } from '../../../common/types'; import { StopWatch } from '../../../common/utils/stopWatch'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../../telemetry'; import { EventName } from '../../../telemetry/constants'; import { AutoSelectionRule, IInterpreterAutoSelectionRule, IInterpreterAutoSelectionService } from '../types'; diff --git a/src/client/interpreter/autoSelection/rules/system.ts b/src/client/interpreter/autoSelection/rules/system.ts index cd3bfeacd44a..1139396cea68 100644 --- a/src/client/interpreter/autoSelection/rules/system.ts +++ b/src/client/interpreter/autoSelection/rules/system.ts @@ -7,7 +7,7 @@ import { inject, injectable } from 'inversify'; import { traceVerbose } from '../../../common/logger'; import { IFileSystem } from '../../../common/platform/types'; import { IPersistentStateFactory, Resource } from '../../../common/types'; -import { InterpreterType } from '../../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../pythonEnvironments/info'; import { IInterpreterHelper, IInterpreterService } from '../../contracts'; import { AutoSelectionRule, IInterpreterAutoSelectionService } from '../types'; import { BaseRuleService, NextAction } from './baseRule'; diff --git a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts index e848e7f4875d..3265bf94a142 100644 --- a/src/client/interpreter/autoSelection/rules/workspaceEnv.ts +++ b/src/client/interpreter/autoSelection/rules/workspaceEnv.ts @@ -12,7 +12,7 @@ import { IFileSystem, IPlatformService } from '../../../common/platform/types'; import { IExperimentsManager, IInterpreterPathService, IPersistentStateFactory, Resource } from '../../../common/types'; import { createDeferredFromPromise } from '../../../common/utils/async'; import { OSType } from '../../../common/utils/platform'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IInterpreterHelper, IInterpreterLocatorService, WORKSPACE_VIRTUAL_ENV_SERVICE } from '../../contracts'; import { AutoSelectionRule, IInterpreterAutoSelectionService } from '../types'; import { BaseRuleService, NextAction } from './baseRule'; diff --git a/src/client/interpreter/autoSelection/types.ts b/src/client/interpreter/autoSelection/types.ts index c055953f77bf..d0fcbf9f9f7f 100644 --- a/src/client/interpreter/autoSelection/types.ts +++ b/src/client/interpreter/autoSelection/types.ts @@ -6,7 +6,7 @@ import { Event, Uri } from 'vscode'; import { IExtensionSingleActivationService } from '../../activation/types'; import { IPersistentState, Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; export const IInterpreterAutoSeletionProxyService = Symbol('IInterpreterAutoSeletionProxyService'); /** diff --git a/src/client/interpreter/configuration/interpreterComparer.ts b/src/client/interpreter/configuration/interpreterComparer.ts index 34fd82867c68..0182ce2e5ee6 100644 --- a/src/client/interpreter/configuration/interpreterComparer.ts +++ b/src/client/interpreter/configuration/interpreterComparer.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { getArchitectureDisplayName } from '../../common/platform/registry'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IInterpreterHelper } from '../contracts'; import { IInterpreterComparer } from './types'; diff --git a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts index 5b33932f7dc5..87feb3e599e4 100644 --- a/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts +++ b/src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts @@ -7,7 +7,7 @@ import { inject, injectable } from 'inversify'; import { Disposable, Uri } from 'vscode'; import { DeprecatePythonPath } from '../../../common/experiments/groups'; import { IExperimentsManager, IPathUtils, Resource } from '../../../common/types'; -import { PythonInterpreter } from '../../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../pythonEnvironments/info'; import { IInterpreterSecurityService } from '../../autoSelection/types'; import { IInterpreterService } from '../../contracts'; import { IInterpreterComparer, IInterpreterQuickPickItem, IInterpreterSelector } from '../types'; diff --git a/src/client/interpreter/configuration/pythonPathUpdaterService.ts b/src/client/interpreter/configuration/pythonPathUpdaterService.ts index e4607c027314..8ad4a38f3155 100644 --- a/src/client/interpreter/configuration/pythonPathUpdaterService.ts +++ b/src/client/interpreter/configuration/pythonPathUpdaterService.ts @@ -5,7 +5,7 @@ import { traceError } from '../../common/logger'; import { IPythonExecutionFactory } from '../../common/process/types'; import { StopWatch } from '../../common/utils/stopWatch'; import { IServiceContainer } from '../../ioc/types'; -import { InterpreterInformation } from '../../pythonEnvironments/discovery/types'; +import { InterpreterInformation } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { PythonInterpreterTelemetry } from '../../telemetry/types'; diff --git a/src/client/interpreter/configuration/types.ts b/src/client/interpreter/configuration/types.ts index 82ff9fe08f44..a2c96e32147c 100644 --- a/src/client/interpreter/configuration/types.ts +++ b/src/client/interpreter/configuration/types.ts @@ -1,6 +1,6 @@ import { ConfigurationTarget, Disposable, QuickPickItem, Uri } from 'vscode'; import { Resource } from '../../common/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; export interface IPythonPathUpdaterService { updatePythonPath(pythonPath: string | undefined): Promise; diff --git a/src/client/interpreter/contracts.ts b/src/client/interpreter/contracts.ts index e641262da48d..640a3639c0ba 100644 --- a/src/client/interpreter/contracts.ts +++ b/src/client/interpreter/contracts.ts @@ -3,7 +3,7 @@ import { CodeLensProvider, Disposable, Event, TextDocument, Uri } from 'vscode'; import { Resource } from '../common/types'; import { CondaEnvironmentInfo, CondaInfo } from '../pythonEnvironments/discovery/locators/services/conda'; import { GetInterpreterLocatorOptions } from '../pythonEnvironments/discovery/locators/types'; -import { InterpreterType, PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../pythonEnvironments/info'; import { WorkspacePythonPath } from './helpers'; import { GetInterpreterOptions } from './interpreterService'; diff --git a/src/client/interpreter/display/index.ts b/src/client/interpreter/display/index.ts index e50966711d11..e1f2449e62fd 100644 --- a/src/client/interpreter/display/index.ts +++ b/src/client/interpreter/display/index.ts @@ -6,7 +6,7 @@ import '../../common/extensions'; import { IDisposableRegistry, IOutputChannel, IPathUtils, Resource } from '../../common/types'; import { Interpreters } from '../../common/utils/localize'; import { IServiceContainer } from '../../ioc/types'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { IInterpreterAutoSelectionService } from '../autoSelection/types'; import { IInterpreterDisplay, IInterpreterHelper, IInterpreterService } from '../contracts'; diff --git a/src/client/interpreter/helpers.ts b/src/client/interpreter/helpers.ts index d1c50441a76f..7bc1f2339246 100644 --- a/src/client/interpreter/helpers.ts +++ b/src/client/interpreter/helpers.ts @@ -8,7 +8,7 @@ import { IPythonExecutionFactory } from '../common/process/types'; import { IPersistentStateFactory, Resource } from '../common/types'; import { IServiceContainer } from '../ioc/types'; import { InterpeterHashProviderFactory } from '../pythonEnvironments/discovery/locators/services/hashProviderFactory'; -import { InterpreterInformation, InterpreterType, PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { InterpreterInformation, InterpreterType, PythonInterpreter } from '../pythonEnvironments/info'; import { IInterpreterHelper } from './contracts'; import { IInterpreterHashProviderFactory } from './locators/types'; diff --git a/src/client/interpreter/interpreterService.ts b/src/client/interpreter/interpreterService.ts index c5075fe175c8..6fa05f296bb1 100644 --- a/src/client/interpreter/interpreterService.ts +++ b/src/client/interpreter/interpreterService.ts @@ -21,7 +21,7 @@ import { import { sleep } from '../common/utils/async'; import { IServiceContainer } from '../ioc/types'; import { InterpeterHashProviderFactory } from '../pythonEnvironments/discovery/locators/services/hashProviderFactory'; -import { InterpreterType, PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../pythonEnvironments/info'; import { captureTelemetry } from '../telemetry'; import { EventName } from '../telemetry/constants'; import { diff --git a/src/client/interpreter/interpreterVersion.ts b/src/client/interpreter/interpreterVersion.ts index 381a8c85a705..47d551a94122 100644 --- a/src/client/interpreter/interpreterVersion.ts +++ b/src/client/interpreter/interpreterVersion.ts @@ -2,7 +2,7 @@ import { inject, injectable } from 'inversify'; import '../common/extensions'; import * as internalPython from '../common/process/internal/python'; import { IProcessServiceFactory } from '../common/process/types'; -import { getPythonVersion } from '../pythonEnvironments/pythonVersion'; +import { getPythonVersion } from '../pythonEnvironments/info/pythonVersion'; import { IInterpreterVersionService } from './contracts'; export const PIP_VERSION_REGEX = '\\d+\\.\\d+(\\.\\d+)?'; diff --git a/src/client/interpreter/locators/types.ts b/src/client/interpreter/locators/types.ts index bc37bc2d8734..2229a2cc8252 100644 --- a/src/client/interpreter/locators/types.ts +++ b/src/client/interpreter/locators/types.ts @@ -4,7 +4,7 @@ 'use strict'; import { Uri } from 'vscode'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; export const IPythonInPathCommandProvider = Symbol('IPythonInPathCommandProvider'); export interface IPythonInPathCommandProvider { diff --git a/src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts b/src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts index 5ff9afb61095..f3e8aa1a66ed 100644 --- a/src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts +++ b/src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts @@ -9,7 +9,7 @@ import { traceDecorators, traceError } from '../../common/logger'; import { IPlatformService } from '../../common/platform/types'; import { IBrowserService, IPersistentStateFactory } from '../../common/types'; import { Common, Interpreters } from '../../common/utils/localize'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IInterpreterService } from '../contracts'; diff --git a/src/client/interpreter/virtualEnvs/index.ts b/src/client/interpreter/virtualEnvs/index.ts index 34b2839a3b71..5a0de7a7ca54 100644 --- a/src/client/interpreter/virtualEnvs/index.ts +++ b/src/client/interpreter/virtualEnvs/index.ts @@ -12,7 +12,7 @@ import { ICurrentProcess, IPathUtils } from '../../common/types'; import { getNamesAndValues } from '../../common/utils/enum'; import { noop } from '../../common/utils/misc'; import { IServiceContainer } from '../../ioc/types'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; import { IInterpreterLocatorService, IPipEnvService, PIPENV_SERVICE } from '../contracts'; import { IVirtualEnvironmentManager } from './types'; diff --git a/src/client/interpreter/virtualEnvs/types.ts b/src/client/interpreter/virtualEnvs/types.ts index fafc83b24816..076d9ed9b736 100644 --- a/src/client/interpreter/virtualEnvs/types.ts +++ b/src/client/interpreter/virtualEnvs/types.ts @@ -2,7 +2,7 @@ // Licensed under the MIT License. import { Uri } from 'vscode'; -import { InterpreterType } from '../../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../pythonEnvironments/info'; export const IVirtualEnvironmentManager = Symbol('VirtualEnvironmentManager'); export interface IVirtualEnvironmentManager { getEnvironmentName(pythonPath: string, resource?: Uri): Promise; diff --git a/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts b/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts index 08bd0a5d2140..09eafae72862 100644 --- a/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts +++ b/src/client/interpreter/virtualEnvs/virtualEnvPrompt.ts @@ -9,7 +9,7 @@ import { traceDecorators } from '../../common/logger'; import { IDisposableRegistry, IPersistentStateFactory } from '../../common/types'; import { sleep } from '../../common/utils/async'; import { Common, Interpreters } from '../../common/utils/localize'; -import { PythonInterpreter } from '../../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../pythonEnvironments/info'; import { sendTelemetryEvent } from '../../telemetry'; import { EventName } from '../../telemetry/constants'; import { IPythonPathUpdaterServiceManager } from '../configuration/types'; diff --git a/src/client/languageServices/jediProxyFactory.ts b/src/client/languageServices/jediProxyFactory.ts index 6b7dd4653788..d151d563d650 100644 --- a/src/client/languageServices/jediProxyFactory.ts +++ b/src/client/languageServices/jediProxyFactory.ts @@ -2,7 +2,7 @@ import { Disposable, Uri, workspace } from 'vscode'; import { IServiceContainer } from '../ioc/types'; import { ICommandResult, JediProxy, JediProxyHandler } from '../providers/jediProxy'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; export class JediFactory implements Disposable { private disposables: Disposable[]; diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts index a7eb21ab2b3f..c72a700f03f7 100644 --- a/src/client/providers/jediProxy.ts +++ b/src/client/providers/jediProxy.ts @@ -25,7 +25,7 @@ import { swallowExceptions } from '../common/utils/decorators'; import { StopWatch } from '../common/utils/stopWatch'; import { IEnvironmentVariablesProvider } from '../common/variables/types'; import { IServiceContainer } from '../ioc/types'; -import { PythonInterpreter } from '../pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../pythonEnvironments/info'; import { sendTelemetryEvent } from '../telemetry'; import { EventName } from '../telemetry/constants'; import { traceError, traceWarning } from './../common/logger'; diff --git a/src/client/pythonEnvironments/discovery/locators/helpers.ts b/src/client/pythonEnvironments/discovery/locators/helpers.ts index 8f1b4b0c7a77..2d543840dc65 100644 --- a/src/client/pythonEnvironments/discovery/locators/helpers.ts +++ b/src/client/pythonEnvironments/discovery/locators/helpers.ts @@ -6,7 +6,7 @@ import { IS_WINDOWS } from '../../../common/platform/constants'; import { IFileSystem } from '../../../common/platform/types'; import { IInterpreterLocatorHelper } from '../../../interpreter/contracts'; import { IPipEnvServiceHelper } from '../../../interpreter/locators/types'; -import { InterpreterType, PythonInterpreter } from '../types'; +import { InterpreterType, PythonInterpreter } from '../../info'; const CheckPythonInterpreterRegEx = IS_WINDOWS ? /^python(\d+(.\d+)?)?\.exe$/ : /^python(\d+(.\d+)?)?$/; diff --git a/src/client/pythonEnvironments/discovery/locators/index.ts b/src/client/pythonEnvironments/discovery/locators/index.ts index 0005509d50a1..fd6a69dbfdbc 100644 --- a/src/client/pythonEnvironments/discovery/locators/index.ts +++ b/src/client/pythonEnvironments/discovery/locators/index.ts @@ -19,7 +19,7 @@ import { } from '../../../interpreter/contracts'; import { IInterpreterFilter } from '../../../interpreter/locators/types'; import { IServiceContainer } from '../../../ioc/types'; -import { PythonInterpreter } from '../types'; +import { PythonInterpreter } from '../../info'; import { InterpreterFilter } from './services/interpreterFilter'; import { GetInterpreterLocatorOptions } from './types'; diff --git a/src/client/pythonEnvironments/discovery/locators/progressService.ts b/src/client/pythonEnvironments/discovery/locators/progressService.ts index 30ecb37539ba..ed6a48f282f0 100644 --- a/src/client/pythonEnvironments/discovery/locators/progressService.ts +++ b/src/client/pythonEnvironments/discovery/locators/progressService.ts @@ -11,7 +11,7 @@ import { createDeferredFrom, Deferred } from '../../../common/utils/async'; import { noop } from '../../../common/utils/misc'; import { IInterpreterLocatorProgressService, IInterpreterLocatorService } from '../../../interpreter/contracts'; import { IServiceContainer } from '../../../ioc/types'; -import { PythonInterpreter } from '../types'; +import { PythonInterpreter } from '../../info'; @injectable() export class InterpreterLocatorProgressService implements IInterpreterLocatorProgressService { diff --git a/src/client/pythonEnvironments/discovery/locators/services/KnownPathsService.ts b/src/client/pythonEnvironments/discovery/locators/services/KnownPathsService.ts index b4685c1923ae..367bef9de946 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/KnownPathsService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/KnownPathsService.ts @@ -6,7 +6,7 @@ import { IFileSystem, IPlatformService } from '../../../../common/platform/types import { ICurrentProcess, IPathUtils } from '../../../../common/types'; import { IInterpreterHelper, IKnownSearchPathsForInterpreters } from '../../../../interpreter/contracts'; import { IServiceContainer } from '../../../../ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { lookForInterpretersInDirectory } from '../helpers'; import { CacheableLocatorService } from './cacheableLocatorService'; const flatten = require('lodash/flatten') as typeof import('lodash/flatten'); diff --git a/src/client/pythonEnvironments/discovery/locators/services/baseVirtualEnvService.ts b/src/client/pythonEnvironments/discovery/locators/services/baseVirtualEnvService.ts index d512f7eae84a..8838659ca14f 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/baseVirtualEnvService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/baseVirtualEnvService.ts @@ -8,7 +8,7 @@ import { IFileSystem, IPlatformService } from '../../../../common/platform/types import { IInterpreterHelper, IVirtualEnvironmentsSearchPathProvider } from '../../../../interpreter/contracts'; import { IVirtualEnvironmentManager } from '../../../../interpreter/virtualEnvs/types'; import { IServiceContainer } from '../../../../ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { lookForInterpretersInDirectory } from '../helpers'; import { CacheableLocatorService } from './cacheableLocatorService'; const flatten = require('lodash/flatten') as typeof import('lodash/flatten'); diff --git a/src/client/pythonEnvironments/discovery/locators/services/cacheableLocatorService.ts b/src/client/pythonEnvironments/discovery/locators/services/cacheableLocatorService.ts index ed97fdd3bf25..8bcd4b96136c 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/cacheableLocatorService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/cacheableLocatorService.ts @@ -16,7 +16,7 @@ import { IInterpreterLocatorService, IInterpreterWatcher } from '../../../../int import { IServiceContainer } from '../../../../ioc/types'; import { sendTelemetryEvent } from '../../../../telemetry'; import { EventName } from '../../../../telemetry/constants'; -import { PythonInterpreter } from '../../types'; +import { PythonInterpreter } from '../../../info'; import { GetInterpreterLocatorOptions } from '../types'; /** diff --git a/src/client/pythonEnvironments/discovery/locators/services/conda.ts b/src/client/pythonEnvironments/discovery/locators/services/conda.ts index fb57c1911c60..87b5478e2b4c 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/conda.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/conda.ts @@ -1,4 +1,4 @@ -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; // tslint:disable-next-line:variable-name export const AnacondaCompanyNames = ['Anaconda, Inc.', 'Continuum Analytics, Inc.']; diff --git a/src/client/pythonEnvironments/discovery/locators/services/condaEnvFileService.ts b/src/client/pythonEnvironments/discovery/locators/services/condaEnvFileService.ts index 3ba93c88e312..6b76a95f567d 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/condaEnvFileService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/condaEnvFileService.ts @@ -15,7 +15,7 @@ import { traceError } from '../../../../common/logger'; import { IFileSystem } from '../../../../common/platform/types'; import { ICondaService, IInterpreterHelper } from '../../../../interpreter/contracts'; import { IServiceContainer } from '../../../../ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { CacheableLocatorService } from './cacheableLocatorService'; import { AnacondaCompanyName } from './conda'; diff --git a/src/client/pythonEnvironments/discovery/locators/services/condaEnvService.ts b/src/client/pythonEnvironments/discovery/locators/services/condaEnvService.ts index ddd5f48ebad5..54e5d01100b8 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/condaEnvService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/condaEnvService.ts @@ -7,7 +7,7 @@ import { traceError } from '../../../../common/logger'; import { IFileSystem } from '../../../../common/platform/types'; import { ICondaService, IInterpreterHelper } from '../../../../interpreter/contracts'; import { IServiceContainer } from '../../../../ioc/types'; -import { PythonInterpreter } from '../../types'; +import { PythonInterpreter } from '../../../info'; import { CacheableLocatorService } from './cacheableLocatorService'; import { parseCondaInfo } from './conda'; diff --git a/src/client/pythonEnvironments/discovery/locators/services/condaService.ts b/src/client/pythonEnvironments/discovery/locators/services/condaService.ts index a5450af6fdf1..7f9a7e57233a 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/condaService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/condaService.ts @@ -10,7 +10,7 @@ import { IProcessServiceFactory } from '../../../../common/process/types'; import { IConfigurationService, IDisposableRegistry, IPersistentStateFactory } from '../../../../common/types'; import { cache } from '../../../../common/utils/decorators'; import { ICondaService, IInterpreterLocatorService, WINDOWS_REGISTRY_SERVICE } from '../../../../interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { CondaEnvironmentInfo, CondaInfo } from './conda'; import { parseCondaEnvFileContents } from './condaHelper'; diff --git a/src/client/pythonEnvironments/discovery/locators/services/currentPathService.ts b/src/client/pythonEnvironments/discovery/locators/services/currentPathService.ts index 3614fc4fc5ba..e0d523abf19f 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/currentPathService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/currentPathService.ts @@ -10,7 +10,7 @@ import { OSType } from '../../../../common/utils/platform'; import { IInterpreterHelper } from '../../../../interpreter/contracts'; import { IPythonInPathCommandProvider } from '../../../../interpreter/locators/types'; import { IServiceContainer } from '../../../../ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { CacheableLocatorService } from './cacheableLocatorService'; /** diff --git a/src/client/pythonEnvironments/discovery/locators/services/interpreterFilter.ts b/src/client/pythonEnvironments/discovery/locators/services/interpreterFilter.ts index 695fcae4c815..f82175d69a98 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/interpreterFilter.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/interpreterFilter.ts @@ -5,7 +5,7 @@ import { inject, injectable } from 'inversify'; import { IInterpreterFilter, IWindowsStoreInterpreter } from '../../../../interpreter/locators/types'; -import { PythonInterpreter } from '../../types'; +import { PythonInterpreter } from '../../../info'; import { WindowsStoreInterpreter } from './windowsStoreInterpreter'; @injectable() diff --git a/src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts b/src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts index e268f405734e..79dba15b6729 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts @@ -15,7 +15,7 @@ import { IPipEnvServiceHelper } from '../../../../interpreter/locators/types'; import { IServiceContainer } from '../../../../ioc/types'; import { sendTelemetryEvent } from '../../../../telemetry'; import { EventName } from '../../../../telemetry/constants'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; import { GetInterpreterLocatorOptions } from '../types'; import { CacheableLocatorService } from './cacheableLocatorService'; diff --git a/src/client/pythonEnvironments/discovery/locators/services/windowsRegistryService.ts b/src/client/pythonEnvironments/discovery/locators/services/windowsRegistryService.ts index 81fefaa98e98..4cc062982ebb 100644 --- a/src/client/pythonEnvironments/discovery/locators/services/windowsRegistryService.ts +++ b/src/client/pythonEnvironments/discovery/locators/services/windowsRegistryService.ts @@ -10,8 +10,8 @@ import { Architecture } from '../../../../common/utils/platform'; import { IInterpreterHelper } from '../../../../interpreter/contracts'; import { IWindowsStoreInterpreter } from '../../../../interpreter/locators/types'; import { IServiceContainer } from '../../../../ioc/types'; -import { parsePythonVersion } from '../../../pythonVersion'; -import { InterpreterType, PythonInterpreter } from '../../types'; +import { InterpreterType, PythonInterpreter } from '../../../info'; +import { parsePythonVersion } from '../../../info/pythonVersion'; import { CacheableLocatorService } from './cacheableLocatorService'; import { AnacondaCompanyName, AnacondaCompanyNames } from './conda'; import { WindowsStoreInterpreter } from './windowsStoreInterpreter'; diff --git a/src/client/pythonEnvironments/discovery/types.ts b/src/client/pythonEnvironments/info/index.ts similarity index 100% rename from src/client/pythonEnvironments/discovery/types.ts rename to src/client/pythonEnvironments/info/index.ts diff --git a/src/client/pythonEnvironments/info.ts b/src/client/pythonEnvironments/info/interpreter.ts similarity index 75% rename from src/client/pythonEnvironments/info.ts rename to src/client/pythonEnvironments/info/interpreter.ts index 8027fd8f34cf..42c4dfb76699 100644 --- a/src/client/pythonEnvironments/info.ts +++ b/src/client/pythonEnvironments/info/interpreter.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -import { PythonEnvInfo } from '../common/process/internal/scripts'; -import { Architecture } from '../common/utils/platform'; -import { InterpreterInformation } from './discovery/types'; +import { InterpreterInformation } from '.'; +import { PythonEnvInfo } from '../../common/process/internal/scripts'; +import { Architecture } from '../../common/utils/platform'; import { parsePythonVersion } from './pythonVersion'; export function extractInterpreterInfo(python: string, raw: PythonEnvInfo): InterpreterInformation { diff --git a/src/client/pythonEnvironments/pythonVersion.ts b/src/client/pythonEnvironments/info/pythonVersion.ts similarity index 93% rename from src/client/pythonEnvironments/pythonVersion.ts rename to src/client/pythonEnvironments/info/pythonVersion.ts index b98fc7dfc22d..2b34dfd1f526 100644 --- a/src/client/pythonEnvironments/pythonVersion.ts +++ b/src/client/pythonEnvironments/info/pythonVersion.ts @@ -2,8 +2,8 @@ // Licensed under the MIT License. import { SemVer } from 'semver'; -import '../common/extensions'; // For string.splitLines() -import { getVersion as getPythonVersionCommand } from '../common/process/internal/python'; +import '../../common/extensions'; // For string.splitLines() +import { getVersion as getPythonVersionCommand } from '../../common/process/internal/python'; export type PythonVersion = { raw: string; diff --git a/src/client/startupTelemetry.ts b/src/client/startupTelemetry.ts index ecf548fabafa..8b270dc95967 100644 --- a/src/client/startupTelemetry.ts +++ b/src/client/startupTelemetry.ts @@ -20,7 +20,7 @@ import { } from './interpreter/autoSelection/types'; import { ICondaService, IInterpreterService } from './interpreter/contracts'; import { IServiceContainer } from './ioc/types'; -import { PythonInterpreter } from './pythonEnvironments/discovery/types'; +import { PythonInterpreter } from './pythonEnvironments/info'; import { sendTelemetryEvent } from './telemetry'; import { EventName } from './telemetry/constants'; import { EditorLoadTelemetry } from './telemetry/types'; diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts index 916071751483..c8d67c17317b 100644 --- a/src/client/telemetry/index.ts +++ b/src/client/telemetry/index.ts @@ -24,7 +24,7 @@ import { DebugConfigurationType } from '../debugger/extension/types'; import { ConsoleType, TriggerType } from '../debugger/types'; import { AutoSelectionRule } from '../interpreter/autoSelection/types'; import { LinterId } from '../linters/types'; -import { InterpreterType } from '../pythonEnvironments/discovery/types'; +import { InterpreterType } from '../pythonEnvironments/info'; import { TestProvider } from '../testing/common/types'; import { EventName, PlatformErrors } from './constants'; import { LinterTrigger, TestTool } from './types'; diff --git a/src/test/activation/activationService.unit.test.ts b/src/test/activation/activationService.unit.test.ts index 6c7e41761f36..ae0c34aa5a6d 100644 --- a/src/test/activation/activationService.unit.test.ts +++ b/src/test/activation/activationService.unit.test.ts @@ -33,7 +33,7 @@ import { noop } from '../../client/common/utils/misc'; import { Architecture } from '../../client/common/utils/platform'; import { IInterpreterService } from '../../client/interpreter/contracts'; import { IServiceContainer } from '../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; // tslint:disable:max-func-body-length no-any diff --git a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts index fb35f6211445..1eb3d78b1ae7 100644 --- a/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts +++ b/src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts @@ -44,7 +44,7 @@ import { sleep } from '../../../../client/common/utils/async'; import { noop } from '../../../../client/common/utils/misc'; import { IInterpreterHelper, IInterpreterService } from '../../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../../client/ioc/types'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; suite('Application Diagnostics - Checks Mac Python Interpreter', () => { let diagnosticService: IDiagnosticsService; diff --git a/src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts b/src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts index e0dfed705c65..863f87cf53ca 100644 --- a/src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts +++ b/src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts @@ -31,7 +31,7 @@ import { IConfigurationService, IDisposableRegistry, IPythonSettings } from '../ import { noop } from '../../../../client/common/utils/misc'; import { IInterpreterHelper, IInterpreterService } from '../../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Application Diagnostics - Checks Python Interpreter', () => { let diagnosticService: IDiagnosticsService; diff --git a/src/test/common.ts b/src/test/common.ts index 6522238d8852..9d84ae11fdce 100644 --- a/src/test/common.ts +++ b/src/test/common.ts @@ -14,7 +14,7 @@ import { IExtensionApi } from '../client/api'; import { IProcessService } from '../client/common/process/types'; import { IDisposable, IPythonSettings, Resource } from '../client/common/types'; import { IServiceContainer, IServiceManager } from '../client/ioc/types'; -import { PythonInterpreter } from '../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../client/pythonEnvironments/info'; import { EXTENSION_ROOT_DIR_FOR_TESTS, IS_MULTI_ROOT_TEST, IS_PERF_TEST, IS_SMOKE_TEST } from './constants'; import { noop, sleep } from './core'; diff --git a/src/test/common/installer/channelManager.unit.test.ts b/src/test/common/installer/channelManager.unit.test.ts index 2fd11fa21ce8..9bdbf88df5e8 100644 --- a/src/test/common/installer/channelManager.unit.test.ts +++ b/src/test/common/installer/channelManager.unit.test.ts @@ -13,7 +13,7 @@ import { Product } from '../../../client/common/types'; import { Installer } from '../../../client/common/utils/localize'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../client/pythonEnvironments/info'; // tslint:disable-next-line: max-func-body-length suite('InstallationChannelManager - getInstallationChannel()', () => { diff --git a/src/test/common/installer/installer.invalidPath.unit.test.ts b/src/test/common/installer/installer.invalidPath.unit.test.ts index 063e7d67298f..b7484c27c0e3 100644 --- a/src/test/common/installer/installer.invalidPath.unit.test.ts +++ b/src/test/common/installer/installer.invalidPath.unit.test.ts @@ -17,7 +17,7 @@ import { IPersistentState, IPersistentStateFactory, Product } from '../../../cli import { getNamesAndValues } from '../../../client/common/utils/enum'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; use(chaiAsPromised); diff --git a/src/test/common/installer/installer.unit.test.ts b/src/test/common/installer/installer.unit.test.ts index 2360e9012c72..1ea7be604f70 100644 --- a/src/test/common/installer/installer.unit.test.ts +++ b/src/test/common/installer/installer.unit.test.ts @@ -56,7 +56,7 @@ import { getNamesAndValues } from '../../../client/common/utils/enum'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { ServiceContainer } from '../../../client/ioc/container'; import { IServiceContainer } from '../../../client/ioc/types'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { sleep } from '../../common'; use(chaiAsPromised); diff --git a/src/test/common/installer/moduleInstaller.unit.test.ts b/src/test/common/installer/moduleInstaller.unit.test.ts index 37bbd3095e01..e11fb2d56505 100644 --- a/src/test/common/installer/moduleInstaller.unit.test.ts +++ b/src/test/common/installer/moduleInstaller.unit.test.ts @@ -44,7 +44,7 @@ import { Products } from '../../../client/common/utils/localize'; import { noop } from '../../../client/common/utils/misc'; import { ICondaService, IInterpreterService } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../constants'; const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py'); diff --git a/src/test/common/installer/pipEnvInstaller.unit.test.ts b/src/test/common/installer/pipEnvInstaller.unit.test.ts index 21afbc9dbfb5..b76f18add910 100644 --- a/src/test/common/installer/pipEnvInstaller.unit.test.ts +++ b/src/test/common/installer/pipEnvInstaller.unit.test.ts @@ -9,7 +9,7 @@ import { Uri } from 'vscode'; import { PipEnvInstaller } from '../../../client/common/installer/pipEnvInstaller'; import { IInterpreterLocatorService, PIPENV_SERVICE } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable-next-line: max-func-body-length suite('PipEnv installer', async () => { diff --git a/src/test/common/moduleInstaller.test.ts b/src/test/common/moduleInstaller.test.ts index cd8335c59376..cb2071331094 100644 --- a/src/test/common/moduleInstaller.test.ts +++ b/src/test/common/moduleInstaller.test.ts @@ -132,7 +132,7 @@ import { InterpreterHashProvider } from '../../client/pythonEnvironments/discove import { InterpeterHashProviderFactory } from '../../client/pythonEnvironments/discovery/locators/services/hashProviderFactory'; import { InterpreterFilter } from '../../client/pythonEnvironments/discovery/locators/services/interpreterFilter'; import { WindowsStoreInterpreter } from '../../client/pythonEnvironments/discovery/locators/services/windowsStoreInterpreter'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { ImportTracker } from '../../client/telemetry/importTracker'; import { IImportTracker } from '../../client/telemetry/types'; import { getExtensionSettings, PYTHON_PATH, rootWorkspaceUri } from '../common'; diff --git a/src/test/common/process/pythonDaemon.functional.test.ts b/src/test/common/process/pythonDaemon.functional.test.ts index 718d3bfeae82..1b55dce2e7fa 100644 --- a/src/test/common/process/pythonDaemon.functional.test.ts +++ b/src/test/common/process/pythonDaemon.functional.test.ts @@ -23,8 +23,8 @@ import { IPythonExecutionService } from '../../../client/common/process/types'; 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/discovery/types'; -import { parsePythonVersion } from '../../../client/pythonEnvironments/pythonVersion'; +import { PythonVersionInfo } from '../../../client/pythonEnvironments/info'; +import { parsePythonVersion } from '../../../client/pythonEnvironments/info/pythonVersion'; import { isPythonVersion, PYTHON_PATH } from '../../common'; import { createTemporaryFile } from '../../utils/fs'; use(chaiPromised); diff --git a/src/test/common/process/pythonDaemonPool.functional.test.ts b/src/test/common/process/pythonDaemonPool.functional.test.ts index 7dc755c07fe7..85b471529dc5 100644 --- a/src/test/common/process/pythonDaemonPool.functional.test.ts +++ b/src/test/common/process/pythonDaemonPool.functional.test.ts @@ -30,8 +30,8 @@ import { noop } from '../../../client/common/utils/misc'; 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/discovery/types'; -import { parsePythonVersion } from '../../../client/pythonEnvironments/pythonVersion'; +import { PythonVersionInfo } from '../../../client/pythonEnvironments/info'; +import { parsePythonVersion } from '../../../client/pythonEnvironments/info/pythonVersion'; import { isPythonVersion, PYTHON_PATH, waitForCondition } from '../../common'; import { createTemporaryFile } from '../../utils/fs'; use(chaiPromised); diff --git a/src/test/common/process/pythonDaemonPool.unit.test.ts b/src/test/common/process/pythonDaemonPool.unit.test.ts index 822306803e0f..b1b8849ac3e3 100644 --- a/src/test/common/process/pythonDaemonPool.unit.test.ts +++ b/src/test/common/process/pythonDaemonPool.unit.test.ts @@ -16,7 +16,7 @@ import { PythonDaemonExecutionService } from '../../../client/common/process/pyt import { PythonDaemonExecutionServicePool } from '../../../client/common/process/pythonDaemonPool'; import { IProcessLogger, IPythonExecutionService, Output } from '../../../client/common/process/types'; import { sleep } from '../../../client/common/utils/async'; -import { InterpreterInformation } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterInformation } from '../../../client/pythonEnvironments/info'; import { noop } from '../../core'; use(chaiPromised); diff --git a/src/test/common/process/pythonExecutionFactory.unit.test.ts b/src/test/common/process/pythonExecutionFactory.unit.test.ts index 791e91b149e7..83153dc8d5fd 100644 --- a/src/test/common/process/pythonExecutionFactory.unit.test.ts +++ b/src/test/common/process/pythonExecutionFactory.unit.test.ts @@ -34,7 +34,7 @@ import { IWindowsStoreInterpreter } from '../../../client/interpreter/locators/t import { ServiceContainer } from '../../../client/ioc/container'; import { CondaService } from '../../../client/pythonEnvironments/discovery/locators/services/condaService'; import { WindowsStoreInterpreter } from '../../../client/pythonEnvironments/discovery/locators/services/windowsStoreInterpreter'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable:no-any max-func-body-length chai-vague-errors diff --git a/src/test/common/terminals/environmentActivationProviders/pipEnvActivationProvider.unit.test.ts b/src/test/common/terminals/environmentActivationProviders/pipEnvActivationProvider.unit.test.ts index a75b303c095e..950659895ee5 100644 --- a/src/test/common/terminals/environmentActivationProviders/pipEnvActivationProvider.unit.test.ts +++ b/src/test/common/terminals/environmentActivationProviders/pipEnvActivationProvider.unit.test.ts @@ -16,7 +16,7 @@ import { ITerminalActivationCommandProvider, TerminalShellType } from '../../../ import { getNamesAndValues } from '../../../../client/common/utils/enum'; import { IInterpreterService, IPipEnvService } from '../../../../client/interpreter/contracts'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; // tslint:disable:no-any diff --git a/src/test/common/terminals/helper.unit.test.ts b/src/test/common/terminals/helper.unit.test.ts index bf8c71c8d3fa..2e0881f1cbab 100644 --- a/src/test/common/terminals/helper.unit.test.ts +++ b/src/test/common/terminals/helper.unit.test.ts @@ -30,7 +30,7 @@ import { Architecture, OSType } from '../../../client/common/utils/platform'; import { ICondaService } from '../../../client/interpreter/contracts'; import { InterpreterService } from '../../../client/interpreter/interpreterService'; import { CondaService } from '../../../client/pythonEnvironments/discovery/locators/services/condaService'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable:max-func-body-length no-any diff --git a/src/test/common/terminals/pyenvActivationProvider.unit.test.ts b/src/test/common/terminals/pyenvActivationProvider.unit.test.ts index 13fceaf3a93c..d6d87c42087d 100644 --- a/src/test/common/terminals/pyenvActivationProvider.unit.test.ts +++ b/src/test/common/terminals/pyenvActivationProvider.unit.test.ts @@ -13,7 +13,7 @@ import { getNamesAndValues } from '../../../client/common/utils/enum'; import { Architecture } from '../../../client/common/utils/platform'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; suite('Terminal Environment Activation pyenv', () => { let serviceContainer: TypeMoq.IMock; diff --git a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts index 4174bc296ebb..ffe15121ac07 100644 --- a/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts +++ b/src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts @@ -14,7 +14,7 @@ import { IInterpreterSecurityService } from '../../../client/interpreter/autoSel import { InterpreterSelector } from '../../../client/interpreter/configuration/interpreterSelector/interpreterSelector'; import { IInterpreterComparer, IInterpreterQuickPickItem } from '../../../client/interpreter/configuration/types'; import { IInterpreterService } from '../../../client/interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; const info: PythonInterpreter = { architecture: Architecture.Unknown, diff --git a/src/test/datascience/activation.unit.test.ts b/src/test/datascience/activation.unit.test.ts index 05bdd58f433b..59e091616005 100644 --- a/src/test/datascience/activation.unit.test.ts +++ b/src/test/datascience/activation.unit.test.ts @@ -21,7 +21,7 @@ import { INotebookEditor, INotebookEditorProvider } from '../../client/datascience/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { FakeClock } from '../common'; import { createPythonInterpreter } from '../utils/interpreters'; diff --git a/src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts b/src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts index 7ac46e44c3d0..66f67786861e 100644 --- a/src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts +++ b/src/test/datascience/data-viewing/dataViewerPDependencyService.unit.test.ts @@ -16,7 +16,7 @@ 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 { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; suite('Data Science - DataViewerDependencyService', () => { let dependencyService: DataViewerDependencyService; diff --git a/src/test/datascience/dataScienceIocContainer.ts b/src/test/datascience/dataScienceIocContainer.ts index 69f773bacadc..3bde7b66e5b6 100644 --- a/src/test/datascience/dataScienceIocContainer.ts +++ b/src/test/datascience/dataScienceIocContainer.ts @@ -397,7 +397,7 @@ import { WorkspaceVirtualEnvService } from '../../client/pythonEnvironments/discovery/locators/services/workspaceVirtualEnvService'; import { WorkspaceVirtualEnvWatcherService } from '../../client/pythonEnvironments/discovery/locators/services/workspaceVirtualEnvWatcherService'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { CodeExecutionHelper } from '../../client/terminals/codeExecution/helper'; import { ICodeExecutionHelper } from '../../client/terminals/types'; import { MockOutputChannel } from '../mockClasses'; diff --git a/src/test/datascience/execution.unit.test.ts b/src/test/datascience/execution.unit.test.ts index d2dc3d450aaf..8fc1bf50775d 100644 --- a/src/test/datascience/execution.unit.test.ts +++ b/src/test/datascience/execution.unit.test.ts @@ -61,7 +61,7 @@ import { IInterpreterService } from '../../client/interpreter/contracts'; import { InterpreterService } from '../../client/interpreter/interpreterService'; import { ServiceContainer } from '../../client/ioc/container'; import { KnownSearchPathsForInterpreters } from '../../client/pythonEnvironments/discovery/locators/services/KnownPathsService'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { getOSType, OSType } from '../common'; import { noop } from '../core'; import { MockOutputChannel } from '../mockClasses'; diff --git a/src/test/datascience/executionServiceMock.ts b/src/test/datascience/executionServiceMock.ts index ef90e3bfac05..7739f4d305f2 100644 --- a/src/test/datascience/executionServiceMock.ts +++ b/src/test/datascience/executionServiceMock.ts @@ -14,7 +14,7 @@ import { SpawnOptions } from '../../client/common/process/types'; import { Architecture } from '../../client/common/utils/platform'; -import { InterpreterInformation } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterInformation } from '../../client/pythonEnvironments/info'; export class MockPythonExecutionService implements IPythonExecutionService { private procService: ProcessService; diff --git a/src/test/datascience/interactive-common/notebookServerProvider.unit.test.ts b/src/test/datascience/interactive-common/notebookServerProvider.unit.test.ts index 4bb209b79b57..971c99274774 100644 --- a/src/test/datascience/interactive-common/notebookServerProvider.unit.test.ts +++ b/src/test/datascience/interactive-common/notebookServerProvider.unit.test.ts @@ -11,7 +11,7 @@ import { NotebookServerProvider } from '../../../client/datascience/interactive- import { ProgressReporter } from '../../../client/datascience/progress/progressReporter'; import { IJupyterExecution, INotebookServer } from '../../../client/datascience/types'; import { IInterpreterService } from '../../../client/interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable:no-any function createTypeMoq(tag: string): typemoq.IMock { diff --git a/src/test/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts b/src/test/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts index f4e2b203077d..2dbcc450fa1a 100644 --- a/src/test/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts +++ b/src/test/datascience/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts @@ -20,7 +20,7 @@ import { JupyterInterpreterDependencyService } from '../../../../client/datascience/jupyter/interpreter/jupyterInterpreterDependencyService'; import { IJupyterCommand, IJupyterCommandFactory } from '../../../../client/datascience/types'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; // tslint:disable: max-func-body-length no-any diff --git a/src/test/datascience/jupyter/interpreter/jupyterInterpreterService.unit.test.ts b/src/test/datascience/jupyter/interpreter/jupyterInterpreterService.unit.test.ts index abf7f6dc2aad..4dca801af99c 100644 --- a/src/test/datascience/jupyter/interpreter/jupyterInterpreterService.unit.test.ts +++ b/src/test/datascience/jupyter/interpreter/jupyterInterpreterService.unit.test.ts @@ -17,7 +17,7 @@ import { JupyterInterpreterService } from '../../../../client/datascience/jupyte import { JupyterInterpreterStateStore } from '../../../../client/datascience/jupyter/interpreter/jupyterInterpreterStateStore'; import { IInterpreterService } from '../../../../client/interpreter/contracts'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { MockMemento } from '../../../mocks/mementos'; import { createPythonInterpreter } from '../../../utils/interpreters'; diff --git a/src/test/datascience/jupyter/interpreter/jupyterInterpreterStateStore.unit.test.ts b/src/test/datascience/jupyter/interpreter/jupyterInterpreterStateStore.unit.test.ts index 1d32fc060141..6e4d41fa9a6f 100644 --- a/src/test/datascience/jupyter/interpreter/jupyterInterpreterStateStore.unit.test.ts +++ b/src/test/datascience/jupyter/interpreter/jupyterInterpreterStateStore.unit.test.ts @@ -8,7 +8,7 @@ import { anything, instance, mock, when } from 'ts-mockito'; import { EventEmitter, Memento } from 'vscode'; import { JupyterInterpreterService } from '../../../../client/datascience/jupyter/interpreter/jupyterInterpreterService'; import { JupyterInterpreterStateStore } from '../../../../client/datascience/jupyter/interpreter/jupyterInterpreterStateStore'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { MockMemento } from '../../../mocks/mementos'; suite('Data Science - Jupyter Interpreter State', () => { diff --git a/src/test/datascience/jupyter/kernels/kernelSelections.unit.test.ts b/src/test/datascience/jupyter/kernels/kernelSelections.unit.test.ts index 31a68d26e8a8..81cac5423c6e 100644 --- a/src/test/datascience/jupyter/kernels/kernelSelections.unit.test.ts +++ b/src/test/datascience/jupyter/kernels/kernelSelections.unit.test.ts @@ -20,7 +20,7 @@ import { IKernelFinder } from '../../../../client/datascience/kernel-launcher/ty import { IJupyterKernel, IJupyterKernelSpec, IJupyterSessionManager } from '../../../../client/datascience/types'; import { InterpreterSelector } from '../../../../client/interpreter/configuration/interpreterSelector/interpreterSelector'; import { IInterpreterQuickPickItem, IInterpreterSelector } from '../../../../client/interpreter/configuration/types'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; // tslint:disable-next-line: max-func-body-length suite('Data Science - KernelSelections', () => { diff --git a/src/test/datascience/jupyter/kernels/kernelSelector.unit.test.ts b/src/test/datascience/jupyter/kernels/kernelSelector.unit.test.ts index c7b7c07383e9..f47fc6ed0916 100644 --- a/src/test/datascience/jupyter/kernels/kernelSelector.unit.test.ts +++ b/src/test/datascience/jupyter/kernels/kernelSelector.unit.test.ts @@ -25,7 +25,7 @@ import { IKernelFinder } from '../../../../client/datascience/kernel-launcher/ty import { IJupyterKernelSpec, IJupyterSessionManager } from '../../../../client/datascience/types'; import { IInterpreterService } from '../../../../client/interpreter/contracts'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; // tslint:disable: max-func-body-length no-unused-expression diff --git a/src/test/datascience/jupyter/kernels/kernelService.unit.test.ts b/src/test/datascience/jupyter/kernels/kernelService.unit.test.ts index 04df9371d4e7..07c92b58746d 100644 --- a/src/test/datascience/jupyter/kernels/kernelService.unit.test.ts +++ b/src/test/datascience/jupyter/kernels/kernelService.unit.test.ts @@ -31,7 +31,7 @@ import { EnvironmentActivationService } from '../../../../client/interpreter/act import { IEnvironmentActivationService } from '../../../../client/interpreter/activation/types'; import { IInterpreterService } from '../../../../client/interpreter/contracts'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { FakeClock } from '../../../common'; // tslint:disable-next-line: max-func-body-length diff --git a/src/test/datascience/jupyter/kernels/kernelSwitcher.unit.test.ts b/src/test/datascience/jupyter/kernels/kernelSwitcher.unit.test.ts index 790461f05516..f8f6c9441bd0 100644 --- a/src/test/datascience/jupyter/kernels/kernelSwitcher.unit.test.ts +++ b/src/test/datascience/jupyter/kernels/kernelSwitcher.unit.test.ts @@ -28,7 +28,7 @@ import { IJupyterSessionManagerFactory, INotebook } from '../../../../client/datascience/types'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { noop } from '../../../core'; // tslint:disable: max-func-body-length no-any diff --git a/src/test/datascience/kernel-launcher/kernelDaemonPool.unit.test.ts b/src/test/datascience/kernel-launcher/kernelDaemonPool.unit.test.ts index 77e729581810..f356a15dcf52 100644 --- a/src/test/datascience/kernel-launcher/kernelDaemonPool.unit.test.ts +++ b/src/test/datascience/kernel-launcher/kernelDaemonPool.unit.test.ts @@ -13,7 +13,7 @@ import { KernelDaemonPool } from '../../../client/datascience/kernel-launcher/ke import { IPythonKernelDaemon } from '../../../client/datascience/kernel-launcher/types'; import { IJupyterKernelSpec, IKernelDependencyService } from '../../../client/datascience/types'; import { IInterpreterService } from '../../../client/interpreter/contracts'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { sleep } from '../../core'; import { createPythonInterpreter } from '../../utils/interpreters'; diff --git a/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts b/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts index 626e97f096e8..c2f3cc2b83a2 100644 --- a/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts +++ b/src/test/datascience/kernel-launcher/kernelLauncherDaemon.unit.test.ts @@ -9,7 +9,7 @@ import { KernelDaemonPool } from '../../../client/datascience/kernel-launcher/ke import { PythonKernelLauncherDaemon } from '../../../client/datascience/kernel-launcher/kernelLauncherDaemon'; import { IPythonKernelDaemon } from '../../../client/datascience/kernel-launcher/types'; import { IJupyterKernelSpec } from '../../../client/datascience/types'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { createPythonInterpreter } from '../../utils/interpreters'; // tslint:disable: max-func-body-length no-any diff --git a/src/test/datascience/kernelFinder.unit.test.ts b/src/test/datascience/kernelFinder.unit.test.ts index 5defa15b525d..8841f43a6b74 100644 --- a/src/test/datascience/kernelFinder.unit.test.ts +++ b/src/test/datascience/kernelFinder.unit.test.ts @@ -19,7 +19,7 @@ import { KernelFinder } from '../../client/datascience/kernel-launcher/kernelFin import { IKernelFinder } from '../../client/datascience/kernel-launcher/types'; import { IJupyterKernelSpec } from '../../client/datascience/types'; import { IInterpreterLocatorService, IInterpreterService } from '../../client/interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; suite('Kernel Finder', () => { let interpreterService: typemoq.IMock; diff --git a/src/test/datascience/kernelLauncher.functional.test.ts b/src/test/datascience/kernelLauncher.functional.test.ts index c6ecbca5f423..30fda590e421 100644 --- a/src/test/datascience/kernelLauncher.functional.test.ts +++ b/src/test/datascience/kernelLauncher.functional.test.ts @@ -15,7 +15,7 @@ import { KernelLauncher } from '../../client/datascience/kernel-launcher/kernelL import { IKernelConnection, IKernelFinder } from '../../client/datascience/kernel-launcher/types'; import { createRawKernel } from '../../client/datascience/raw-kernel/rawKernel'; import { IJupyterKernelSpec } from '../../client/datascience/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { sleep, waitForCondition } from '../common'; import { DataScienceIocContainer } from './dataScienceIocContainer'; import { takeSnapshot, writeDiffSnapshot } from './helpers'; diff --git a/src/test/datascience/mockJupyterManager.ts b/src/test/datascience/mockJupyterManager.ts index e9f210ac0942..b3695bdf027b 100644 --- a/src/test/datascience/mockJupyterManager.ts +++ b/src/test/datascience/mockJupyterManager.ts @@ -39,7 +39,7 @@ import { } from '../../client/datascience/types'; import { IInterpreterService } from '../../client/interpreter/contracts'; import { IServiceManager } from '../../client/ioc/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { concatMultilineStringInput } from '../../datascience-ui/common'; import { noop, sleep } from '../core'; import { MockJupyterSession } from './mockJupyterSession'; diff --git a/src/test/datascience/mockJupyterNotebook.ts b/src/test/datascience/mockJupyterNotebook.ts index 73c8e9ae8b10..67d4023907a5 100644 --- a/src/test/datascience/mockJupyterNotebook.ts +++ b/src/test/datascience/mockJupyterNotebook.ts @@ -20,7 +20,7 @@ import { InterruptResult, KernelSocketInformation } from '../../client/datascience/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { ServerStatus } from '../../datascience-ui/interactive-common/mainState'; import { noop } from '../core'; diff --git a/src/test/datascience/mockLanguageServerCache.ts b/src/test/datascience/mockLanguageServerCache.ts index 16c8447a67a0..a730c038e400 100644 --- a/src/test/datascience/mockLanguageServerCache.ts +++ b/src/test/datascience/mockLanguageServerCache.ts @@ -5,7 +5,7 @@ import { injectable } from 'inversify'; import { Uri } from 'vscode'; import { ILanguageServer, ILanguageServerCache } from '../../client/activation/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { MockLanguageServer } from './mockLanguageServer'; // tslint:disable:no-any unified-signatures diff --git a/src/test/datascience/mockLanguageServerProxy.ts b/src/test/datascience/mockLanguageServerProxy.ts index 942ef9229d38..762f6ac6d92c 100644 --- a/src/test/datascience/mockLanguageServerProxy.ts +++ b/src/test/datascience/mockLanguageServerProxy.ts @@ -6,7 +6,7 @@ import { Uri } from 'vscode'; import { LanguageClient, LanguageClientOptions } from 'vscode-languageclient'; import { ILanguageServerProxy } from '../../client/activation/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; import { MockLanguageClient } from './mockLanguageClient'; // tslint:disable:no-any unified-signatures diff --git a/src/test/datascience/mockPythonService.ts b/src/test/datascience/mockPythonService.ts index 0fcd6c97fa4d..8eae75fee6d9 100644 --- a/src/test/datascience/mockPythonService.ts +++ b/src/test/datascience/mockPythonService.ts @@ -7,7 +7,7 @@ import { ObservableExecutionResult, SpawnOptions } from '../../client/common/process/types'; -import { InterpreterInformation, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterInformation, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { MockProcessService } from './mockProcessService'; export class MockPythonService implements IPythonExecutionService { diff --git a/src/test/datascience/notebook.functional.test.ts b/src/test/datascience/notebook.functional.test.ts index 9ebe304889dc..4acc233f3cfa 100644 --- a/src/test/datascience/notebook.functional.test.ts +++ b/src/test/datascience/notebook.functional.test.ts @@ -46,7 +46,7 @@ import { InterruptResult } from '../../client/datascience/types'; import { IInterpreterService, IKnownSearchPathsForInterpreters } from '../../client/interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { concatMultilineStringInput } from '../../datascience-ui/common'; import { generateTestState, ICellViewModel } from '../../datascience-ui/interactive-common/mainState'; import { sleep } from '../core'; diff --git a/src/test/datascience/preWarmVariables.unit.test.ts b/src/test/datascience/preWarmVariables.unit.test.ts index d53c01c577f2..20279a3fea23 100644 --- a/src/test/datascience/preWarmVariables.unit.test.ts +++ b/src/test/datascience/preWarmVariables.unit.test.ts @@ -12,7 +12,7 @@ import { JupyterInterpreterService } from '../../client/datascience/jupyter/inte import { PreWarmActivatedJupyterEnvironmentVariables } from '../../client/datascience/preWarmVariables'; import { EnvironmentActivationService } from '../../client/interpreter/activation/service'; import { IEnvironmentActivationService } from '../../client/interpreter/activation/types'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { sleep } from '../core'; suite('DataScience - PreWarm Env Vars', () => { diff --git a/src/test/debugger/extension/adapter/factory.unit.test.ts b/src/test/debugger/extension/adapter/factory.unit.test.ts index 5712cd0778a0..550f2d416dae 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -29,7 +29,7 @@ import { DebugAdapterDescriptorFactory } from '../../../../client/debugger/exten import { IDebugAdapterDescriptorFactory } from '../../../../client/debugger/extension/types'; import { IInterpreterService } from '../../../../client/interpreter/contracts'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; import { clearTelemetryReporter } from '../../../../client/telemetry'; import { EventName } from '../../../../client/telemetry/constants'; import { MockOutputChannel } from '../../../mockClasses'; diff --git a/src/test/install/channelManager.channels.test.ts b/src/test/install/channelManager.channels.test.ts index 5af9d848ec7b..fd96f8ea663e 100644 --- a/src/test/install/channelManager.channels.test.ts +++ b/src/test/install/channelManager.channels.test.ts @@ -19,7 +19,7 @@ import { IInterpreterLocatorService, PIPENV_SERVICE } from '../../client/interpr import { ServiceContainer } from '../../client/ioc/container'; import { ServiceManager } from '../../client/ioc/serviceManager'; import { IServiceContainer } from '../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { MockAutoSelectionService } from '../mocks/autoSelector'; const info: PythonInterpreter = { diff --git a/src/test/install/channelManager.messages.test.ts b/src/test/install/channelManager.messages.test.ts index b1cd29cca634..94b45ef2a17c 100644 --- a/src/test/install/channelManager.messages.test.ts +++ b/src/test/install/channelManager.messages.test.ts @@ -19,7 +19,7 @@ import { IInterpreterService } from '../../client/interpreter/contracts'; import { ServiceContainer } from '../../client/ioc/container'; import { ServiceManager } from '../../client/ioc/serviceManager'; import { IServiceContainer } from '../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { MockAutoSelectionService } from '../mocks/autoSelector'; const info: PythonInterpreter = { diff --git a/src/test/interpreters/activation/service.unit.test.ts b/src/test/interpreters/activation/service.unit.test.ts index f0a7ed4e9c67..d44ed185dc4c 100644 --- a/src/test/interpreters/activation/service.unit.test.ts +++ b/src/test/interpreters/activation/service.unit.test.ts @@ -27,7 +27,7 @@ import { EXTENSION_ROOT_DIR } from '../../../client/constants'; import { EnvironmentActivationService } from '../../../client/interpreter/activation/service'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { InterpreterService } from '../../../client/interpreter/interpreterService'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; const getEnvironmentPrefix = 'e8b39361-0157-4923-80e1-22d70d46dee6'; const defaultShells = { diff --git a/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts b/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts index a34618842cb2..e3617798c09d 100644 --- a/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts +++ b/src/test/interpreters/activation/terminalEnvironmentActivationService.unit.test.ts @@ -16,7 +16,7 @@ import { EnvironmentVariablesProvider } from '../../../client/common/variables/e import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types'; import { TerminalEnvironmentActivationService } from '../../../client/interpreter/activation/terminalEnvironmentActivationService'; import { IEnvironmentActivationService } from '../../../client/interpreter/activation/types'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { noop } from '../../core'; // tslint:disable-next-line: max-func-body-length diff --git a/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts b/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts index b18f874e6eda..7e2ef4443057 100644 --- a/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts +++ b/src/test/interpreters/activation/wrapperEnvironmentActivationService.unit.test.ts @@ -21,7 +21,7 @@ import { IEnvironmentActivationService } from '../../../client/interpreter/activ import { WrapperEnvironmentActivationService } from '../../../client/interpreter/activation/wrapperEnvironmentActivationService'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { InterpreterService } from '../../../client/interpreter/interpreterService'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable-next-line: max-func-body-length suite('Interpreters Activation - Python Environment Variables (wrap terminal and proc approach)', () => { diff --git a/src/test/interpreters/autoSelection/index.unit.test.ts b/src/test/interpreters/autoSelection/index.unit.test.ts index 61ddabc3fd7b..21fbdcc83315 100644 --- a/src/test/interpreters/autoSelection/index.unit.test.ts +++ b/src/test/interpreters/autoSelection/index.unit.test.ts @@ -32,7 +32,7 @@ import { } from '../../../client/interpreter/autoSelection/types'; import { IInterpreterHelper } from '../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../client/interpreter/helpers'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; const preferredGlobalInterpreter = 'preferredGlobalPyInterpreter'; diff --git a/src/test/interpreters/autoSelection/proxy.unit.test.ts b/src/test/interpreters/autoSelection/proxy.unit.test.ts index ce063869b929..b3e4409a2d72 100644 --- a/src/test/interpreters/autoSelection/proxy.unit.test.ts +++ b/src/test/interpreters/autoSelection/proxy.unit.test.ts @@ -9,7 +9,7 @@ import { expect } from 'chai'; import { Event, EventEmitter, Uri } from 'vscode'; import { InterpreterAutoSeletionProxyService } from '../../../client/interpreter/autoSelection/proxy'; import { IInterpreterAutoSeletionProxyService } from '../../../client/interpreter/autoSelection/types'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection Proxy', () => { class InstanceClass implements IInterpreterAutoSeletionProxyService { diff --git a/src/test/interpreters/autoSelection/rules/base.unit.test.ts b/src/test/interpreters/autoSelection/rules/base.unit.test.ts index a425aaa8e290..07f139739f85 100644 --- a/src/test/interpreters/autoSelection/rules/base.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/base.unit.test.ts @@ -21,7 +21,7 @@ import { AutoSelectionRule, IInterpreterAutoSelectionService } from '../../../../client/interpreter/autoSelection/types'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Base Rule', () => { let rule: BaseRuleServiceTest; diff --git a/src/test/interpreters/autoSelection/rules/cached.unit.test.ts b/src/test/interpreters/autoSelection/rules/cached.unit.test.ts index e67b6dc3d30e..790cd1e9e58c 100644 --- a/src/test/interpreters/autoSelection/rules/cached.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/cached.unit.test.ts @@ -24,7 +24,7 @@ import { } from '../../../../client/interpreter/autoSelection/types'; import { IInterpreterHelper } from '../../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../../client/interpreter/helpers'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Cached Rule', () => { let rule: CachedInterpretersAutoSelectionRuleTest; diff --git a/src/test/interpreters/autoSelection/rules/currentPath.unit.test.ts b/src/test/interpreters/autoSelection/rules/currentPath.unit.test.ts index e1a563f6f811..a96448f6efe3 100644 --- a/src/test/interpreters/autoSelection/rules/currentPath.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/currentPath.unit.test.ts @@ -21,7 +21,7 @@ import { IInterpreterAutoSelectionService } from '../../../../client/interpreter import { IInterpreterHelper, IInterpreterLocatorService } from '../../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../../client/interpreter/helpers'; import { KnownPathsService } from '../../../../client/pythonEnvironments/discovery/locators/services/KnownPathsService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Current Path Rule', () => { let rule: CurrentPathInterpretersAutoSelectionRuleTest; diff --git a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts index 17dfc91ebefa..805f4b6260bb 100644 --- a/src/test/interpreters/autoSelection/rules/settings.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/settings.unit.test.ts @@ -25,7 +25,7 @@ import { InterpreterAutoSelectionService } from '../../../../client/interpreter/ import { NextAction } from '../../../../client/interpreter/autoSelection/rules/baseRule'; import { SettingsInterpretersAutoSelectionRule } from '../../../../client/interpreter/autoSelection/rules/settings'; import { IInterpreterAutoSelectionService } from '../../../../client/interpreter/autoSelection/types'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Settings Rule', () => { let rule: SettingsInterpretersAutoSelectionRuleTest; diff --git a/src/test/interpreters/autoSelection/rules/system.unit.test.ts b/src/test/interpreters/autoSelection/rules/system.unit.test.ts index 38dcc2e650bf..b52bc51e8a6f 100644 --- a/src/test/interpreters/autoSelection/rules/system.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/system.unit.test.ts @@ -21,7 +21,7 @@ import { IInterpreterAutoSelectionService } from '../../../../client/interpreter import { IInterpreterHelper, IInterpreterService } from '../../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../../client/interpreter/helpers'; import { InterpreterService } from '../../../../client/interpreter/interpreterService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - System Interpreters Rule', () => { let rule: SystemWideInterpretersAutoSelectionRuleTest; diff --git a/src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts b/src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts index ee072b53944d..ce7b7a303511 100644 --- a/src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts @@ -24,7 +24,7 @@ import { IInterpreterAutoSelectionService } from '../../../../client/interpreter import { IInterpreterHelper, IInterpreterLocatorService } from '../../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../../client/interpreter/helpers'; import { WindowsRegistryService } from '../../../../client/pythonEnvironments/discovery/locators/services/windowsRegistryService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Windows Registry Rule', () => { let rule: WindowsRegistryInterpretersAutoSelectionRuleTest; diff --git a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts index 958e158ecc65..8f0b7ebe9602 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -35,7 +35,7 @@ import { IInterpreterAutoSelectionService } from '../../../../client/interpreter import { IInterpreterHelper, IInterpreterLocatorService } from '../../../../client/interpreter/contracts'; import { InterpreterHelper } from '../../../../client/interpreter/helpers'; import { KnownPathsService } from '../../../../client/pythonEnvironments/discovery/locators/services/KnownPathsService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Auto Selection - Workspace Virtual Envs Rule', () => { type PythonPathInConfig = { workspaceFolderValue: string; workspaceValue: string }; diff --git a/src/test/interpreters/currentPathService.unit.test.ts b/src/test/interpreters/currentPathService.unit.test.ts index a246ad17490b..694aa1de63d9 100644 --- a/src/test/interpreters/currentPathService.unit.test.ts +++ b/src/test/interpreters/currentPathService.unit.test.ts @@ -27,7 +27,7 @@ import { CurrentPathService, PythonInPathCommandProvider } from '../../client/pythonEnvironments/discovery/locators/services/currentPathService'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../constants'; const isolated = path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'pythonFiles', 'pyvsc-run-isolated.py'); diff --git a/src/test/interpreters/display.unit.test.ts b/src/test/interpreters/display.unit.test.ts index 0a11115cf4d6..a7c5a5ca2514 100644 --- a/src/test/interpreters/display.unit.test.ts +++ b/src/test/interpreters/display.unit.test.ts @@ -22,7 +22,7 @@ import { IInterpreterDisplay, IInterpreterHelper, IInterpreterService } from '.. import { InterpreterDisplay } from '../../client/interpreter/display'; import { IVirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs/types'; import { IServiceContainer } from '../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; // tslint:disable:no-any max-func-body-length diff --git a/src/test/interpreters/interpreterService.unit.test.ts b/src/test/interpreters/interpreterService.unit.test.ts index 8148c93b82ff..8bcb47a423a9 100644 --- a/src/test/interpreters/interpreterService.unit.test.ts +++ b/src/test/interpreters/interpreterService.unit.test.ts @@ -47,7 +47,7 @@ import { IInterpreterHashProvider, IInterpreterHashProviderFactory } from '../.. import { IVirtualEnvironmentManager } from '../../client/interpreter/virtualEnvs/types'; import { ServiceContainer } from '../../client/ioc/container'; import { ServiceManager } from '../../client/ioc/serviceManager'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; import { PYTHON_PATH } from '../common'; import { MockAutoSelectionService } from '../mocks/autoSelector'; diff --git a/src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts b/src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts index 147f6c78550b..f48ea816c044 100644 --- a/src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts +++ b/src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts @@ -19,7 +19,7 @@ import { CondaInheritEnvPrompt, condaInheritEnvPromptKey } from '../../../client/interpreter/virtualEnvs/condaInheritEnvPrompt'; -import { InterpreterType } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../client/pythonEnvironments/info'; // tslint:disable:no-any diff --git a/src/test/interpreters/virtualEnvs/index.unit.test.ts b/src/test/interpreters/virtualEnvs/index.unit.test.ts index 9365ecfb26a0..9538223821a2 100644 --- a/src/test/interpreters/virtualEnvs/index.unit.test.ts +++ b/src/test/interpreters/virtualEnvs/index.unit.test.ts @@ -17,7 +17,7 @@ import { ICurrentProcess, IPathUtils } from '../../../client/common/types'; import { IInterpreterLocatorService, IPipEnvService, PIPENV_SERVICE } from '../../../client/interpreter/contracts'; import { VirtualEnvironmentManager } from '../../../client/interpreter/virtualEnvs'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../client/pythonEnvironments/info'; // tslint:disable-next-line:max-func-body-length suite('Virtual Environment Manager', () => { diff --git a/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts b/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts index cc90f13e743c..07c628a113be 100644 --- a/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts +++ b/src/test/interpreters/virtualEnvs/virtualEnvPrompt.unit.test.ts @@ -22,7 +22,7 @@ import { InterpreterHelper } from '../../../client/interpreter/helpers'; import { VirtualEnvironmentPrompt } from '../../../client/interpreter/virtualEnvs/virtualEnvPrompt'; import { CacheableLocatorService } from '../../../client/pythonEnvironments/discovery/locators/services/cacheableLocatorService'; import { InterpreterWatcherBuilder } from '../../../client/pythonEnvironments/discovery/locators/services/interpreterWatcherBuilder'; -import { PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../client/pythonEnvironments/info'; // tslint:disable-next-line:max-func-body-length suite('Virtual Environment Prompt', () => { diff --git a/src/test/mocks/autoSelector.ts b/src/test/mocks/autoSelector.ts index 53400a4e9c6b..c0b6130bbd73 100644 --- a/src/test/mocks/autoSelector.ts +++ b/src/test/mocks/autoSelector.ts @@ -10,7 +10,7 @@ import { IInterpreterAutoSelectionService, IInterpreterAutoSeletionProxyService } from '../../client/interpreter/autoSelection/types'; -import { PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../client/pythonEnvironments/info'; @injectable() export class MockAutoSelectionService diff --git a/src/test/pythonEnvironments/discovery/locators/cacheableLocatorService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/cacheableLocatorService.unit.test.ts index 54c8f5e6dee5..a6dc8b0b61bc 100644 --- a/src/test/pythonEnvironments/discovery/locators/cacheableLocatorService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/cacheableLocatorService.unit.test.ts @@ -17,7 +17,7 @@ import { IInterpreterWatcher } from '../../../../client/interpreter/contracts'; import { ServiceContainer } from '../../../../client/ioc/container'; import { IServiceContainer } from '../../../../client/ioc/types'; import { CacheableLocatorService } from '../../../../client/pythonEnvironments/discovery/locators/services/cacheableLocatorService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Cacheable Locator Service', () => { suite('Caching', () => { diff --git a/src/test/pythonEnvironments/discovery/locators/condaEnvFileService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/condaEnvFileService.unit.test.ts index 09dcc1a2fb5c..b91521e1f74e 100644 --- a/src/test/pythonEnvironments/discovery/locators/condaEnvFileService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/condaEnvFileService.unit.test.ts @@ -12,7 +12,7 @@ import { import { IServiceContainer } from '../../../../client/ioc/types'; import { AnacondaCompanyName } from '../../../../client/pythonEnvironments/discovery/locators/services/conda'; import { CondaEnvFileService } from '../../../../client/pythonEnvironments/discovery/locators/services/condaEnvFileService'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; import { MockState } from '../../../interpreters/mocks'; const environmentsPath = path.join(__dirname, '..', '..', '..', 'src', 'test', 'pythonFiles', 'environments'); diff --git a/src/test/pythonEnvironments/discovery/locators/condaEnvService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/condaEnvService.unit.test.ts index 27cf8714ea45..0b98d2e07136 100644 --- a/src/test/pythonEnvironments/discovery/locators/condaEnvService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/condaEnvService.unit.test.ts @@ -12,7 +12,7 @@ import { parseCondaInfo } from '../../../../client/pythonEnvironments/discovery/locators/services/conda'; import { CondaEnvService } from '../../../../client/pythonEnvironments/discovery/locators/services/condaEnvService'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; import { MockState } from '../../../interpreters/mocks'; import { UnitTestIocContainer } from '../../../testing/serviceRegistry'; diff --git a/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts index 70edf077dafc..d5b7e7938949 100644 --- a/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/condaService.unit.test.ts @@ -17,7 +17,7 @@ import { Architecture } from '../../../../client/common/utils/platform'; import { IInterpreterLocatorService, IInterpreterService } from '../../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../../client/ioc/types'; import { CondaService } from '../../../../client/pythonEnvironments/discovery/locators/services/condaService'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { MockState } from '../../../interpreters/mocks'; const untildify: (value: string) => string = require('untildify'); diff --git a/src/test/pythonEnvironments/discovery/locators/helpers.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/helpers.unit.test.ts index e456a1d7848b..be005fda70e2 100644 --- a/src/test/pythonEnvironments/discovery/locators/helpers.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/helpers.unit.test.ts @@ -18,7 +18,7 @@ import { IPipEnvServiceHelper } from '../../../../client/interpreter/locators/ty import { IServiceContainer } from '../../../../client/ioc/types'; import { InterpreterLocatorHelper } from '../../../../client/pythonEnvironments/discovery/locators/helpers'; import { PipEnvServiceHelper } from '../../../../client/pythonEnvironments/discovery/locators/services/pipEnvServiceHelper'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; enum OS { Windows = 'Windows', diff --git a/src/test/pythonEnvironments/discovery/locators/index.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/index.unit.test.ts index 260ab18331a7..00fae76cd52c 100644 --- a/src/test/pythonEnvironments/discovery/locators/index.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/index.unit.test.ts @@ -28,7 +28,7 @@ import { import { IInterpreterFilter } from '../../../../client/interpreter/locators/types'; import { IServiceContainer } from '../../../../client/ioc/types'; import { PythonInterpreterLocatorService } from '../../../../client/pythonEnvironments/discovery/locators'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; suite('Interpreters - Locators Index', () => { let serviceContainer: TypeMoq.IMock; diff --git a/src/test/pythonEnvironments/discovery/locators/interpreterLocatorService.testvirtualenvs.ts b/src/test/pythonEnvironments/discovery/locators/interpreterLocatorService.testvirtualenvs.ts index 25446eb891a1..e4d8ac339f97 100644 --- a/src/test/pythonEnvironments/discovery/locators/interpreterLocatorService.testvirtualenvs.ts +++ b/src/test/pythonEnvironments/discovery/locators/interpreterLocatorService.testvirtualenvs.ts @@ -8,7 +8,7 @@ import * as path from 'path'; import { RegistryImplementation } from '../../../../client/common/platform/registry'; import { IRegistry } from '../../../../client/common/platform/types'; import { IInterpreterLocatorService, INTERPRETER_LOCATOR_SERVICE } from '../../../../client/interpreter/contracts'; -import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { getOSType, OSType } from '../../../common'; import { TEST_TIMEOUT } from '../../../constants'; import { closeActiveWindows, initialize, initializeTest } from '../../../initialize'; diff --git a/src/test/pythonEnvironments/discovery/locators/progressService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/progressService.unit.test.ts index 0bab4d2aee60..957fba97b8b6 100644 --- a/src/test/pythonEnvironments/discovery/locators/progressService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/progressService.unit.test.ts @@ -13,7 +13,7 @@ import { noop } from '../../../../client/common/utils/misc'; import { IInterpreterLocatorService } from '../../../../client/interpreter/contracts'; import { ServiceContainer } from '../../../../client/ioc/container'; import { InterpreterLocatorProgressService } from '../../../../client/pythonEnvironments/discovery/locators/progressService'; -import { PythonInterpreter } from '../../../../client/pythonEnvironments/discovery/types'; +import { PythonInterpreter } from '../../../../client/pythonEnvironments/info'; import { sleep } from '../../../core'; suite('Interpreters - Locator Progress', () => { diff --git a/src/test/pythonEnvironments/discovery/locators/windowsRegistryService.unit.test.ts b/src/test/pythonEnvironments/discovery/locators/windowsRegistryService.unit.test.ts index fcc02ebd3772..f58e710a4eb0 100644 --- a/src/test/pythonEnvironments/discovery/locators/windowsRegistryService.unit.test.ts +++ b/src/test/pythonEnvironments/discovery/locators/windowsRegistryService.unit.test.ts @@ -9,7 +9,7 @@ import { IInterpreterHelper } from '../../../../client/interpreter/contracts'; import { IWindowsStoreInterpreter } from '../../../../client/interpreter/locators/types'; import { IServiceContainer } from '../../../../client/ioc/types'; import { WindowsRegistryService } from '../../../../client/pythonEnvironments/discovery/locators/services/windowsRegistryService'; -import { InterpreterType } from '../../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType } from '../../../../client/pythonEnvironments/info'; import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../../constants'; import { MockRegistry, MockState } from '../../../interpreters/mocks'; diff --git a/src/test/pythonEnvironments/info.unit.test.ts b/src/test/pythonEnvironments/info/interpreter.unit.test.ts similarity index 100% rename from src/test/pythonEnvironments/info.unit.test.ts rename to src/test/pythonEnvironments/info/interpreter.unit.test.ts diff --git a/src/test/pythonEnvironments/pythonVersion.unit.test.ts b/src/test/pythonEnvironments/info/pythonVersion.unit.test.ts similarity index 97% rename from src/test/pythonEnvironments/pythonVersion.unit.test.ts rename to src/test/pythonEnvironments/info/pythonVersion.unit.test.ts index dd4494950a12..70dbd90cacfa 100644 --- a/src/test/pythonEnvironments/pythonVersion.unit.test.ts +++ b/src/test/pythonEnvironments/info/pythonVersion.unit.test.ts @@ -6,7 +6,7 @@ import { assert } from 'chai'; import { join as pathJoin } from 'path'; import { It as TypeMoqIt, Mock, MockBehavior } from 'typemoq'; -import { getPythonVersion, parsePythonVersion } from '../../client/pythonEnvironments/pythonVersion'; +import { getPythonVersion, parsePythonVersion } from '../../../client/pythonEnvironments/info/pythonVersion'; interface IDeps { exec(cmd: string, args: string[]): Promise<{ stdout: string }>; diff --git a/src/test/terminals/codeExecution/helper.test.ts b/src/test/terminals/codeExecution/helper.test.ts index 146b7bbd209a..518804b87dd4 100644 --- a/src/test/terminals/codeExecution/helper.test.ts +++ b/src/test/terminals/codeExecution/helper.test.ts @@ -20,7 +20,7 @@ import { Architecture, OSType } from '../../../client/common/utils/platform'; import { IEnvironmentVariablesProvider } from '../../../client/common/variables/types'; import { IInterpreterService } from '../../../client/interpreter/contracts'; import { IServiceContainer } from '../../../client/ioc/types'; -import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../../client/pythonEnvironments/info'; import { CodeExecutionHelper } from '../../../client/terminals/codeExecution/helper'; import { ICodeExecutionHelper } from '../../../client/terminals/types'; import { isOs, isPythonVersion, PYTHON_PATH } from '../../common'; diff --git a/src/test/utils/interpreters.ts b/src/test/utils/interpreters.ts index 88347c9569d3..ec277a08d589 100644 --- a/src/test/utils/interpreters.ts +++ b/src/test/utils/interpreters.ts @@ -4,7 +4,7 @@ 'use strict'; import { Architecture } from '../../client/common/utils/platform'; -import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/discovery/types'; +import { InterpreterType, PythonInterpreter } from '../../client/pythonEnvironments/info'; /** * Creates a PythonInterpreter object for testing purposes, with unique name, version and path.