diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-14 15:19:26 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-14 15:19:26 +0200 |
commit | 9115712ef3a1be8b401c9cd306792dbc30c89bf0 (patch) | |
tree | 264121693cd1fbf183b8b8cc8bdba99fb9d34350 | |
parent | dfdaea19982a8d5851095f3abe0b792bc733ba10 (diff) | |
parent | f6519b1d343bc26a53374d3066e90495f1959c78 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id9ab658ea9dcc1e61502892fcbc270166f6151de
-rw-r--r-- | coin_build_instructions.py | 9 | ||||
-rw-r--r-- | coin_test_instructions.py | 8 | ||||
-rw-r--r-- | dist/changes-5.14.2.2 | 30 | ||||
-rw-r--r-- | requirements.txt | 10 | ||||
-rw-r--r-- | sources/shiboken2/generator/main.cpp | 2 | ||||
-rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 13 | ||||
-rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 2 |
7 files changed, 58 insertions, 16 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 6453cfad5..5c3033b04 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -109,15 +109,12 @@ def call_setup(python_ver, phase): if phase in ["BUILD"]: rmtree(_env, True) + # Pinning the virtualenv before creating one + run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv") run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") # When the 'python_ver' variable is empty, we are using Python 2 - # setuptools from v45+ removed the support for Python 2, so we pin an old release # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue - upgrade_pip = True if CI_HOST_OS == "Linux" else False - install_pip_dependencies(env_pip, ["pip"], upgrade_pip) - install_pip_dependencies(env_pip, ["numpy" if python_ver else "numpy==1.16.6", - "setuptools" if python_ver else "setuptools==44.0.0", - "sphinx", "six", "wheel"]) + run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") cmd = [env_python, "-u", "setup.py"] if phase in ["BUILD"]: diff --git a/coin_test_instructions.py b/coin_test_instructions.py index cb29acab4..c3752cb9f 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -64,10 +64,12 @@ CI_RELEASE_CONF = has_option("packaging") def call_testrunner(python_ver, buildnro): _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH) rmtree(_env, True) + # Pinning the virtualenv before creating one + run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv") run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - upgrade_pip = True if CI_HOST_OS == "Linux" else False - install_pip_dependencies(env_pip, ["pip"], upgrade_pip) - install_pip_dependencies(env_pip, ["numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.6", "wheel"]) + # When the 'python_ver' variable is empty, we are using Python 2 + # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue + run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", "--buildno=" + buildnro] diff --git a/dist/changes-5.14.2.2 b/dist/changes-5.14.2.2 new file mode 100644 index 000000000..3f9506dde --- /dev/null +++ b/dist/changes-5.14.2.2 @@ -0,0 +1,30 @@ +Qt for Python 5.14.2.2 is a bug-fix release. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qtforpython/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* PySide2 * +**************************************************************************** + + - [PYSIDE-1100] Support type checking with the mypy module + - [PYSIDE-1236] samplebinding: Fix running with Python 3.8.2 on Windows + - [PYSIDE-1255] Fix memory corruption for QML registered types + - [PYSIDE-1271] QMutexLocker: allow-thread in constructor + - [PYSIDE-1272] signature: Add comparison for existing_doc type + - [PYSIDE-1285] qareaseries: keep references of lower/upper series + - [PYSIDE-1293] Windows: Fix encoding in custom message handler + +**************************************************************************** +* Shiboken2 * +**************************************************************************** diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..32b1991dd --- /dev/null +++ b/requirements.txt @@ -0,0 +1,10 @@ +numpy==1.16.6; python_version < '3' +numpy; python_version >= '3' +# setuptools from v45+ removed the support for Python 2, so we pin an old release +setuptools==44.0.0; python_version < '3' +setuptools; python_version >= '3' +sphinx +six +wheel +PyOpenGL +pyinstaller==3.6 diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp index 700dc00bb..25daea99e 100644 --- a/sources/shiboken2/generator/main.cpp +++ b/sources/shiboken2/generator/main.cpp @@ -370,7 +370,7 @@ static void parseIncludePathOption(const QString &option, HeaderType headerType, const CommandArgumentMap::iterator it = args.find(option); if (it != args.end()) { const QStringList includePathListList = - it.value().split(pathSplitter, Qt::SkipEmptyParts); + it.value().split(pathSplitter, QString::SkipEmptyParts); args.erase(it); for (const QString &s : includePathListList) { auto path = QFile::encodeName(QDir::cleanPath(s)); diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 90187ff6b..c0c54f274 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -1509,10 +1509,10 @@ void CppGenerator::writeConverterRegister(QTextStream &s, const AbstractMetaClas QStringList cppSignature; if (!classContext.forSmartPointer()) { cppSignature = metaClass->qualifiedCppName().split(QLatin1String("::"), - Qt::SkipEmptyParts); + QString::SkipEmptyParts); } else { cppSignature = classContext.preciseType()->cppSignature().split(QLatin1String("::"), - Qt::SkipEmptyParts); + QString::SkipEmptyParts); } while (!cppSignature.isEmpty()) { QString signature = cppSignature.join(QLatin1String("::")); @@ -1960,7 +1960,7 @@ void CppGenerator::writeArgumentsInitializer(QTextStream &s, OverloadData &overl s << INDENT << "PyObject *"; s << PYTHON_ARGS << "[] = {" - << QString(maxArgs, QLatin1Char('0')).split(QLatin1String(""), Qt::SkipEmptyParts).join(QLatin1String(", ")) + << QString(maxArgs, QLatin1Char('0')).split(QLatin1String(""), QString::SkipEmptyParts).join(QLatin1String(", ")) << "};\n"; s << endl; @@ -3156,7 +3156,10 @@ void CppGenerator::writeMethodCall(QTextStream &s, const AbstractMetaFunction *f const CodeSnipList &snips = func->injectedCodeSnips(); for (const CodeSnip &cs : snips) { if (cs.position == TypeSystem::CodeSnipPositionEnd) { - s << INDENT << "overloadId = " << func->ownerClass()->functions().indexOf(const_cast<AbstractMetaFunction *const>(func)) << ";\n"; + auto klass = func->ownerClass(); + s << INDENT << "overloadId = " + << klass->functions().indexOf(const_cast<AbstractMetaFunction *>(func)) + << ";\n"; break; } } @@ -5813,7 +5816,7 @@ bool CppGenerator::finishGeneration() if (!referencedType) continue; QString converter = converterObject(referencedType); - QStringList cppSignature = pte->qualifiedCppName().split(QLatin1String("::"), Qt::SkipEmptyParts); + QStringList cppSignature = pte->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); while (!cppSignature.isEmpty()) { QString signature = cppSignature.join(QLatin1String("::")); s << INDENT << "Shiboken::Conversions::registerConverterName(" << converter << ", \"" << signature << "\");\n"; diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 2cdb8870c..b7852c017 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -96,7 +96,7 @@ static QString resolveScopePrefix(const QStringList &scopeList, const QString &v static inline QStringList splitClassScope(const AbstractMetaClass *scope) { - return scope->qualifiedCppName().split(QLatin1String("::"), Qt::SkipEmptyParts); + return scope->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); } static QString resolveScopePrefix(const AbstractMetaClass *scope, const QString &value) |