feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Python: add create venv option to the wizard

Browse Source 
and optimize layouting

Fixes: PYSIDE-2152
Change-Id: If3ecb76c4bac885840f54fd382471ac22a06dee3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
David Schulz
2023-03-10 10:26:56 +01:00
parent 3afe94777c
commit eb8c996f49
5 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/python/pythonsettings.cpp
View File

@@ -773,9 +773,11 @@ void PythonSettings::addInterpreter(const Interpreter &interpreter, bool isDefau
saveSettings();
}
Interpreter PythonSettings::addInterpreter(const FilePath &interpreterPath, bool isDefault)
Interpreter PythonSettings::addInterpreter(const FilePath &interpreterPath,
bool isDefault,
const QString &nameSuffix)
{
const Interpreter interpreter = createInterpreter(interpreterPath, {});
const Interpreter interpreter = createInterpreter(interpreterPath, {}, nameSuffix);
addInterpreter(interpreter, isDefault);
return interpreter;
}
@@ -786,7 +788,7 @@ PythonSettings *PythonSettings::instance()
return settingsInstance;
}
void PythonSettings::createVirtualEnvironment(
void PythonSettings::createVirtualEnvironmentInteractive(
const FilePath &startDirectory,
const Interpreter &defaultInterpreter,
const std::function<void(std::optional<Interpreter>)> &callback)
@@ -829,14 +831,23 @@ void PythonSettings::createVirtualEnvironment(
interpreters->currentData().toString());
auto venvDir = pathChooser->filePath();
createVenv(interpreter.command, venvDir, [venvDir, callback](bool success){
createVirtualEnvironment(venvDir, interpreter, callback);
}
void PythonSettings::createVirtualEnvironment(
const FilePath &directory,
const Interpreter &interpreter,
const std::function<void(std::optional<Interpreter>)> &callback,
const QString &nameSuffix)
{
createVenv(interpreter.command, directory, [directory, callback, nameSuffix](bool success) {
std::optional<Interpreter> result;
if (success) {
FilePath venvPython = venvDir.osType() == Utils::OsTypeWindows ? venvDir / "Scripts"
: venvDir / "bin";
FilePath venvPython = directory.osType() == Utils::OsTypeWindows ? directory / "Scripts"
: directory / "bin";
venvPython = venvPython.pathAppended("python").withExecutableSuffix();
if (venvPython.exists())
result = PythonSettings::addInterpreter(venvPython);
result = PythonSettings::addInterpreter(venvPython, false, nameSuffix);
}
callback(result);
});