Skip to content

Use python instead of python3 in gulp tasks #18410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kimadeline merged 1 commit into from
Feb 1, 2022
Merged

Use python instead of python3 in gulp tasks #18410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 8 additions & 35 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,12 @@ gulp.task('installPythonRequirements', async () => {
'-r',
'./requirements.txt',
];
let success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', args, undefined, true)
.then(() => true)
.catch((ex) => {
console.error("Failed to install Python Libs using 'python3'", ex);
console.error("Failed to install requirements using 'python'", ex);
return false;
});
if (!success) {
console.info("Failed to install Python Libs using 'python3', attempting to install using 'python'");
await spawnAsync('python', args).catch((ex) =>
console.error("Failed to install Python Libs using 'python'", ex),
);
return;
}

args = [
'-m',
Expand All @@ -267,18 +260,12 @@ gulp.task('installPythonRequirements', async () => {
'-r',
'./pythonFiles/jedilsp_requirements/requirements.txt',
];
success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', args, undefined, true)
.then(() => true)
.catch((ex) => {
console.error("Failed to install Python Libs using 'python3'", ex);
console.error("Failed to install Jedi LSP requirements using 'python'", ex);
return false;
});
if (!success) {
console.info("Failed to install Python Libs using 'python3', attempting to install using 'python'");
await spawnAsync('python', args).catch((ex) =>
console.error("Failed to install Python Libs using 'python'", ex),
);
}
});

// See https://github.com/microsoft/vscode-python/issues/7136
Expand All @@ -295,36 +282,22 @@ gulp.task('installDebugpy', async () => {
'-r',
'./build/debugger-install-requirements.txt',
];
const successWithWheelsDeps = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', depsArgs, undefined, true)
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', depsArgs, undefined, true)
.then(() => true)
.catch((ex) => {
console.error("Failed to install new DEBUGPY wheels using 'python3'", ex);
console.error("Failed to install dependencies need by 'install_debugpy.py' using 'python'", ex);
return false;
});
if (!successWithWheelsDeps) {
console.info(
"Failed to install dependencies need by 'install_debugpy.py' using 'python3', attempting to install using 'python'",
);
await spawnAsync('python', depsArgs).catch((ex) =>
console.error("Failed to install dependencies need by 'install_debugpy.py' using 'python'", ex),
);
}

// Install new DEBUGPY with wheels for python 3.7
const wheelsArgs = ['./pythonFiles/install_debugpy.py'];
const wheelsEnv = { PYTHONPATH: './pythonFiles/lib/temp' };
const successWithWheels = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', wheelsArgs, wheelsEnv, true)
await spawnAsync(process.env.CI_PYTHON_PATH || 'python', wheelsArgs, wheelsEnv, true)
.then(() => true)
.catch((ex) => {
console.error("Failed to install new DEBUGPY wheels using 'python3'", ex);
console.error("Failed to install DEBUGPY wheels using 'python'", ex);
return false;
});
if (!successWithWheels) {
console.info("Failed to install new DEBUGPY wheels using 'python3', attempting to install using 'python'");
await spawnAsync('python', wheelsArgs, wheelsEnv).catch((ex) =>
console.error("Failed to install DEBUGPY wheels using 'python'", ex),
);
}

rmrf.sync('./pythonFiles/lib/temp');
});
Expand Down