Skip to content

Commit ae7f466

Browse files
author
Kartik Raj
committed
Put it back in
1 parent 30a8b2c commit ae7f466

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

.github/workflows/pr-check.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,6 @@ jobs:
275275
working-directory: ${{ env.special-working-directory }}
276276
if: matrix.test-suite == 'multi-workspace'
277277

278-
- name: Run multi-workspace tests
279-
env:
280-
CI_PYTHON_VERSION: ${{ matrix.python }}
281-
uses: GabrielBB/[email protected]
282-
with:
283-
run: npm run testMultiWorkspace
284-
working-directory: ${{ env.special-working-directory }}
285-
if: matrix.test-suite == 'multi-workspace'
286-
287278
- name: Run debugger tests
288279
env:
289280
CI_PYTHON_VERSION: ${{ matrix.python }}

src/client/common/process/pythonExecutionFactory.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { inject, injectable } from 'inversify';
44

55
import { IEnvironmentActivationService } from '../../interpreter/activation/types';
6-
import { IComponentAdapter } from '../../interpreter/contracts';
6+
import { IActivatedEnvironmentLaunch, IComponentAdapter } from '../../interpreter/contracts';
77
import { IServiceContainer } from '../../ioc/types';
88
import { sendTelemetryEvent } from '../../telemetry';
99
import { EventName } from '../../telemetry/constants';
@@ -52,10 +52,10 @@ export class PythonExecutionFactory implements IPythonExecutionFactory {
5252
public async create(options: ExecutionFactoryCreationOptions): Promise<IPythonExecutionService> {
5353
let { pythonPath } = options;
5454
if (!pythonPath || pythonPath === 'python') {
55-
// const activatedEnvLaunch = this.serviceContainer.get<IActivatedEnvironmentLaunch>(
56-
// IActivatedEnvironmentLaunch,
57-
// );
58-
// await activatedEnvLaunch.selectIfLaunchedViaActivatedEnv();
55+
const activatedEnvLaunch = this.serviceContainer.get<IActivatedEnvironmentLaunch>(
56+
IActivatedEnvironmentLaunch,
57+
);
58+
await activatedEnvLaunch.selectIfLaunchedViaActivatedEnv();
5959
// If python path wasn't passed in, we need to auto select it and then read it
6060
// from the configuration.
6161
const interpreterPath = this.interpreterPathExpHelper.get(options.resource);

0 commit comments

Comments
 (0)