Skip to content

Commit e90bbfa

Browse files
kimadelinekimadeline
authored
Use python instead of python3 in gulp tasks (microsoft#18410)
1 parent a91af7b commit e90bbfa

1 file changed

Lines changed: 8 additions & 35 deletions

File tree

‎gulpfile.js‎

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -237,19 +237,12 @@ gulp.task('installPythonRequirements', async () => {
237237
'-r',
238238
'./requirements.txt',
239239
];
240-
let success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
240+
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', args, undefined, true)
241241
.then(() => true)
242242
.catch((ex) => {
243-
console.error("Failed to install Python Libs using 'python3'", ex);
243+
console.error("Failed to install requirements using 'python'", ex);
244244
return false;
245245
});
246-
if (!success) {
247-
console.info("Failed to install Python Libs using 'python3', attempting to install using 'python'");
248-
await spawnAsync('python', args).catch((ex) =>
249-
console.error("Failed to install Python Libs using 'python'", ex),
250-
);
251-
return;
252-
}
253246

254247
args = [
255248
'-m',
@@ -267,18 +260,12 @@ gulp.task('installPythonRequirements', async () => {
267260
'-r',
268261
'./pythonFiles/jedilsp_requirements/requirements.txt',
269262
];
270-
success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
263+
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', args, undefined, true)
271264
.then(() => true)
272265
.catch((ex) => {
273-
console.error("Failed to install Python Libs using 'python3'", ex);
266+
console.error("Failed to install Jedi LSP requirements using 'python'", ex);
274267
return false;
275268
});
276-
if (!success) {
277-
console.info("Failed to install Python Libs using 'python3', attempting to install using 'python'");
278-
await spawnAsync('python', args).catch((ex) =>
279-
console.error("Failed to install Python Libs using 'python'", ex),
280-
);
281-
}
282269
});
283270

284271
// See https://github.com/microsoft/vscode-python/issues/7136
@@ -295,36 +282,22 @@ gulp.task('installDebugpy', async () => {
295282
'-r',
296283
'./build/debugger-install-requirements.txt',
297284
];
298-
const successWithWheelsDeps = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', depsArgs, undefined, true)
285+
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', depsArgs, undefined, true)
299286
.then(() => true)
300287
.catch((ex) => {
301-
console.error("Failed to install new DEBUGPY wheels using 'python3'", ex);
288+
console.error("Failed to install dependencies need by 'install_debugpy.py' using 'python'", ex);
302289
return false;
303290
});
304-
if (!successWithWheelsDeps) {
305-
console.info(
306-
"Failed to install dependencies need by 'install_debugpy.py' using 'python3', attempting to install using 'python'",
307-
);
308-
await spawnAsync('python', depsArgs).catch((ex) =>
309-
console.error("Failed to install dependencies need by 'install_debugpy.py' using 'python'", ex),
310-
);
311-
}
312291

313292
// Install new DEBUGPY with wheels for python 3.7
314293
const wheelsArgs = ['./pythonFiles/install_debugpy.py'];
315294
const wheelsEnv = { PYTHONPATH: './pythonFiles/lib/temp' };
316-
const successWithWheels = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', wheelsArgs, wheelsEnv, true)
295+
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', wheelsArgs, wheelsEnv, true)
317296
.then(() => true)
318297
.catch((ex) => {
319-
console.error("Failed to install new DEBUGPY wheels using 'python3'", ex);
298+
console.error("Failed to install DEBUGPY wheels using 'python'", ex);
320299
return false;
321300
});
322-
if (!successWithWheels) {
323-
console.info("Failed to install new DEBUGPY wheels using 'python3', attempting to install using 'python'");
324-
await spawnAsync('python', wheelsArgs, wheelsEnv).catch((ex) =>
325-
console.error("Failed to install DEBUGPY wheels using 'python'", ex),
326-
);
327-
}
328301

329302
rmrf.sync('./pythonFiles/lib/temp');
330303
});

0 commit comments

Comments
 (0)