Skip to content

Try to fix venv setup #163

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

Open
tmontaigu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Try to fix venv setup #163

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions src/PythonConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const wchar_t *PythonConfigPaths::pythonPath() const

//================================================================================

static QString PathToPythonExecutableInEnv(PythonConfig::Type envType, const QString &envRoot)
static QString PathToPythonExecutableInEnv(const PythonConfig::Type envType, const QString &envRoot)
{
#if defined(Q_OS_WINDOWS)
switch (envType)
Expand Down Expand Up @@ -280,7 +280,7 @@ void PythonConfig::initVenv(const QString &venvPrefix)

m_type = Type::Venv;
m_pythonHome = venvPrefix;
m_pythonPath = QString("%1/Lib/site-packages;%3/DLLS;%3/lib").arg(venvPrefix, cfg.home);
m_pythonPath = QString("%1/Lib/site-packages;%2/DLLS;%2/Lib").arg(venvPrefix, cfg.home);
if (cfg.includeSystemSitesPackages)
{
m_pythonPath.append(QString("%1/Lib/site-packages").arg(cfg.home));
Expand All @@ -291,6 +291,10 @@ void PythonConfig::initVenv(const QString &venvPrefix)
#endif
}

QString PythonConfig::pythonExecutable() const {
return PathToPythonExecutableInEnv(type(), m_pythonHome);
}

void PythonConfig::preparePythonProcess(QProcess &pythonProcess) const
{
const QString pythonExePath = PathToPythonExecutableInEnv(type(), m_pythonHome);
Expand Down
7 changes: 7 additions & 0 deletions src/PythonConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ class PythonConfig final
return m_pythonHome;
}

const QString &pythonPath() const
{
return m_pythonPath;
}

QString pythonExecutable() const;

/// Sets the necessary settings of the QProcess so that
/// it uses the correct Python exe.
void preparePythonProcess(QProcess &pythonProcess) const;
Expand Down
27 changes: 19 additions & 8 deletions src/PythonInterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@
#include <QTextCodec>

#include <ccLog.h>
#include <QProcess>

#ifdef Q_OS_LINUX
#include <cstdio>
#include <dlfcn.h>
#endif

// seems like gcc defines macro with these names
// it seems like gcc defines macro with these names
#undef major
#undef minor

Expand Down Expand Up @@ -211,8 +212,7 @@ void PythonInterpreter::initialize(const PythonConfig &config)
}
}
#endif
if (config.type() != PythonConfig::Type::System)
{
if (config.type() != PythonConfig::Type::System) {
// We use PEP 0587 to init the interpreter.
// The changes introduced in this PEP allows to handle the error
// when the interpreter could not be initialized.
Expand All @@ -226,12 +226,17 @@ void PythonInterpreter::initialize(const PythonConfig &config)
PyStatus status;

PyConfig pyConfig;
// I think, in theory, we should use PyConfig_InitIsolatedConfig
// byt non-isolated config is easier to setup
PyConfig_InitPythonConfig(&pyConfig);
pyConfig.isolated = 1;

status = PyConfig_SetString(&pyConfig, &pyConfig.home, m_config.pythonHome());
if (PyStatus_Exception(status))
{
const QString qPythonExecutable = config.pythonExecutable();
const wchar_t* pythonExecutable = QStringToWcharArray(qPythonExecutable);
status = PyConfig_SetString(&pyConfig, &pyConfig.executable,
pythonExecutable);
delete[] pythonExecutable;

if (PyStatus_Exception(status)) {
PyConfig_Clear(&pyConfig);
throw std::runtime_error(status.err_msg);
}
Expand All @@ -243,13 +248,19 @@ void PythonInterpreter::initialize(const PythonConfig &config)
throw std::runtime_error(status.err_msg);
}

status = PyConfig_Read(&pyConfig);
status = PyConfig_SetString(&pyConfig, &pyConfig.home, m_config.pythonHome());
if (PyStatus_Exception(status))
{
PyConfig_Clear(&pyConfig);
throw std::runtime_error(status.err_msg);
}

status = PyConfig_Read(&pyConfig);
if (PyStatus_Exception(status)) {
PyConfig_Clear(&pyConfig);
throw std::runtime_error(status.err_msg);
}

status = Py_InitializeFromConfig(&pyConfig);
if (PyStatus_Exception(status))
{
Expand Down
Loading