Move stuff

Author: Kartik Raj

src/client/pythonEnvironments/collection/environmentsReducer.ts renamed to src/client/pythonEnvironments/base/locators/composite/environmentsReducer.ts

@@ -3,13 +3,13 @@
 
 import { cloneDeep, isEqual } from 'lodash';
 import { Event, EventEmitter } from 'vscode';
-import { traceVerbose } from '../../common/logger';
-import { createDeferred } from '../../common/utils/async';
-import { areSameEnvironment, PythonEnvInfo, PythonEnvKind } from '../base/info';
+import { traceVerbose } from '../../../../common/logger';
+import { createDeferred } from '../../../../common/utils/async';
+import { areSameEnvironment, PythonEnvInfo, PythonEnvKind } from '../../info';
 import {
     ILocator, IPythonEnvsIterator, PythonEnvUpdatedEvent, PythonLocatorQuery,
-} from '../base/locator';
-import { PythonEnvsChangedEvent } from '../base/watcher';
+} from '../../locator';
+import { PythonEnvsChangedEvent } from '../../watcher';
 
 /**
  * Combines duplicate environments received from the incoming locator into one and passes on unique environments

src/client/pythonEnvironments/collection/environmentsResolver.ts renamed to src/client/pythonEnvironments/base/locators/composite/environmentsResolver.ts

@@ -3,14 +3,14 @@
 
 import { cloneDeep } from 'lodash';
 import { Event, EventEmitter } from 'vscode';
-import { traceVerbose } from '../../common/logger';
-import { areSameEnvironment, PythonEnvInfo } from '../base/info';
-import { InterpreterInformation } from '../base/info/interpreter';
+import { traceVerbose } from '../../../../common/logger';
+import { areSameEnvironment, InterpreterInformation } from '../../../info';
+import { IEnvironmentInfoService } from '../../../info/environmentInfoService';
+import { PythonEnvInfo } from '../../info';
 import {
-    ILocator, IPythonEnvsIterator, PythonEnvUpdatedEvent, PythonLocatorQuery,
-} from '../base/locator';
-import { PythonEnvsChangedEvent } from '../base/watcher';
-import { IEnvironmentInfoService } from '../info/environmentInfoService';
+    ILocator, PythonLocatorQuery, IPythonEnvsIterator, PythonEnvUpdatedEvent,
+} from '../../locator';
+import { PythonEnvsChangedEvent } from '../../watcher';
 
 /**
  * Calls environment info service which runs `interpreterInfo.py` script on environments received

src/test/pythonEnvironments/collection/environmentsReducer.unit.test.ts renamed to src/test/pythonEnvironments/base/locators/composite/environmentsReducer.unit.test.ts

@@ -5,15 +5,15 @@ import { assert, expect } from 'chai';
 import { isEqual } from 'lodash';
 import * as path from 'path';
 import { EventEmitter } from 'vscode';
-import { PythonEnvInfo, PythonEnvKind } from '../../../client/pythonEnvironments/base/info';
-import { PythonEnvUpdatedEvent } from '../../../client/pythonEnvironments/base/locator';
-import { PythonEnvsChangedEvent } from '../../../client/pythonEnvironments/base/watcher';
+import { PythonEnvInfo, PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
+import { PythonEnvUpdatedEvent } from '../../../../../client/pythonEnvironments/base/locator';
 import {
     mergeEnvironments,
     PythonEnvsReducer,
-} from '../../../client/pythonEnvironments/collection/environmentsReducer';
-import { sleep } from '../../core';
-import { createEnv, getEnvs, SimpleLocator } from '../base/common';
+} from '../../../../../client/pythonEnvironments/base/locators/composite/environmentsReducer';
+import { PythonEnvsChangedEvent } from '../../../../../client/pythonEnvironments/base/watcher';
+import { sleep } from '../../../../core';
+import { createEnv, getEnvs, SimpleLocator } from '../../common';
 
 suite('Environments Reducer', () => {
     suite('iterEnvs()', () => {

src/test/pythonEnvironments/collection/environmentsResolver.unit.test.ts renamed to src/test/pythonEnvironments/base/locators/composite/environmentsResolver.unit.test.ts

@@ -6,17 +6,17 @@ import { cloneDeep } from 'lodash';
 import * as path from 'path';
 import { ImportMock } from 'ts-mock-imports';
 import { EventEmitter } from 'vscode';
-import { ExecutionResult } from '../../../client/common/process/types';
-import { Architecture } from '../../../client/common/utils/platform';
-import { PythonEnvInfo, PythonEnvKind } from '../../../client/pythonEnvironments/base/info';
-import { parseVersion } from '../../../client/pythonEnvironments/base/info/pythonVersion';
-import { PythonEnvUpdatedEvent } from '../../../client/pythonEnvironments/base/locator';
-import { PythonEnvsChangedEvent } from '../../../client/pythonEnvironments/base/watcher';
-import { PythonEnvsResolver } from '../../../client/pythonEnvironments/collection/environmentsResolver';
-import * as ExternalDep from '../../../client/pythonEnvironments/common/externalDependencies';
-import { EnvironmentInfoService } from '../../../client/pythonEnvironments/info/environmentInfoService';
-import { sleep } from '../../core';
-import { createEnv, getEnvs, SimpleLocator } from '../base/common';
+import { ExecutionResult } from '../../../../../client/common/process/types';
+import { Architecture } from '../../../../../client/common/utils/platform';
+import { PythonEnvInfo, PythonEnvKind } from '../../../../../client/pythonEnvironments/base/info';
+import { parseVersion } from '../../../../../client/pythonEnvironments/base/info/pythonVersion';
+import { PythonEnvUpdatedEvent } from '../../../../../client/pythonEnvironments/base/locator';
+import { PythonEnvsResolver } from '../../../../../client/pythonEnvironments/base/locators/composite/environmentsResolver';
+import { PythonEnvsChangedEvent } from '../../../../../client/pythonEnvironments/base/watcher';
+import * as ExternalDep from '../../../../../client/pythonEnvironments/common/externalDependencies';
+import { EnvironmentInfoService } from '../../../../../client/pythonEnvironments/info/environmentInfoService';
+import { sleep } from '../../../../core';
+import { createEnv, getEnvs, SimpleLocator } from '../../common';
 
 suite('Environments Resolver', () => {
     /**