[neon/forks/pyqt-builder/Neon/release] /: New upstream version 1.13.0+dfsg
Dmitry Shachnev
null at kde.org
Sat Feb 4 00:17:50 GMT 2023
Git commit 977b7555659a93b9f3309b734b8f95600c59f4fa by Dmitry Shachnev.
Committed on 21/06/2022 at 09:45.
Pushed by carlosdem into branch 'Neon/release'.
New upstream version 1.13.0+dfsg
M +52 -0 ChangeLog
M +6 -0 NEWS
M +2 -2 PKG-INFO
M +2 -2 PyQt_builder.egg-info/PKG-INFO
M +0 -4 PyQt_builder.egg-info/SOURCES.txt
M +6 -11 pyqtbuild/builder.py
M +7 -68 pyqtbuild/bundle/abstract_package.py
M +8 -12 pyqtbuild/bundle/packages/pyqt3d.py
M +35 -41 pyqtbuild/bundle/packages/pyqt5.py
M +2 -1 pyqtbuild/bundle/packages/pyqt6_webengine.py
M +2 -3 pyqtbuild/bundle/packages/pyqtchart.py
M +2 -3 pyqtbuild/bundle/packages/pyqtdatavisualization.py
M +2 -3 pyqtbuild/bundle/packages/pyqtnetworkauth.py
M +2 -3 pyqtbuild/bundle/packages/pyqtpurchasing.py
M +16 -31 pyqtbuild/bundle/qt_metadata.py
M +2 -2 pyqtbuild/version.py
M +2 -2 setup.py
https://invent.kde.org/neon/forks/pyqt-builder/commit/977b7555659a93b9f3309b734b8f95600c59f4fa
diff --git a/ChangeLog b/ChangeLog
index 192b22d..a650e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+2022-06-06 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt6_webengine.py:
+ Fix the missing translations from PyQt6-WebEngine.
+ [068a418ac90b] [1.13.0]
+
+2022-05-17 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/builder.py:
+ The default ABI versions are now v12.11 and v13.4.
+ [45bb2785fa46]
+
+2022-05-13 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, pyqtbuild/bundle/packages/pyqt5.py:
+ Fixed a syntax regression.
+ [42b3c6a05629]
+
+2022-04-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * pyqtbuild/bundle/abstract_package.py,
+ pyqtbuild/bundle/packages/pyqt3d.py,
+ pyqtbuild/bundle/packages/pyqt5.py,
+ pyqtbuild/bundle/packages/pyqtchart.py,
+ pyqtbuild/bundle/packages/pyqtdatavisualization.py,
+ pyqtbuild/bundle/packages/pyqtnetworkauth.py,
+ pyqtbuild/bundle/packages/pyqtpurchasing.py,
+ pyqtbuild/bundle/qt_metadata.py:
+ Removed support for versions of Qt older than v5.15.
+ [bd1cfdc9b537]
+
+ * pyqtbuild/bundle/dlls/openssl-32/libeay32.dll,
+ pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll,
+ pyqtbuild/bundle/dlls/openssl-64/libeay32.dll,
+ pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll:
+ Removed the OpenSSL DLLs not used by currently supported versions of
+ Python and Qt.
+ [d3ed99301b00]
+
+ * NEWS, setup.py:
+ Python v3.7 is the minimum supported version.
+ [df64b05608f8]
+
+ * Merged the 1.12-maint branch.
+ [32ee66dabb93]
+
+2021-10-28 Phil Thompson <phil at riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 1.12.2 for changeset 3f1d1850862b
+ [42e269a7a226] <1.12-maint>
+
2021-10-25 Phil Thompson <phil at riverbankcomputing.com>
* pyqtbuild/bundle/qt_metadata.py:
diff --git a/NEWS b/NEWS
index a77740c..723f00d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+v1.13.0 6th June 2022
+ - The default ABI versions are now v12.11 and v13.4 so that wrapped classes
+ can be used by sip.array.
+ - Removed support for bundling version of Qt older than v5.15.
+ - Removed support for Python v3.6.
+
v1.12.2 25th October 2021
- A bug fix release.
diff --git a/PKG-INFO b/PKG-INFO
index bff409f..667514f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt-builder
-Version: 1.12.2
+Version: 1.13.0
Summary: The PEP 517 compliant PyQt build system
Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
@@ -9,7 +9,7 @@ License: SIP
Platform: X11
Platform: macOS
Platform: Windows
-Requires-Python: >=3.5
+Requires-Python: >=3.7
License-File: LICENSE
License-File: LICENSE-GPL3
License-File: LICENSE-GPL2
diff --git a/PyQt_builder.egg-info/PKG-INFO b/PyQt_builder.egg-info/PKG-INFO
index bff409f..667514f 100644
--- a/PyQt_builder.egg-info/PKG-INFO
+++ b/PyQt_builder.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: PyQt-builder
-Version: 1.12.2
+Version: 1.13.0
Summary: The PEP 517 compliant PyQt build system
Home-page: https://www.riverbankcomputing.com/software/pyqt-builder/
Author: Riverbank Computing Limited
@@ -9,7 +9,7 @@ License: SIP
Platform: X11
Platform: macOS
Platform: Windows
-Requires-Python: >=3.5
+Requires-Python: >=3.7
License-File: LICENSE
License-File: LICENSE-GPL3
License-File: LICENSE-GPL2
diff --git a/PyQt_builder.egg-info/SOURCES.txt b/PyQt_builder.egg-info/SOURCES.txt
index fb41b97..5164b36 100644
--- a/PyQt_builder.egg-info/SOURCES.txt
+++ b/PyQt_builder.egg-info/SOURCES.txt
@@ -93,13 +93,9 @@ pyqtbuild/bundle/dlls/msvc-64/msvcp140_2.dll
pyqtbuild/bundle/dlls/msvc-64/vcruntime140.dll
pyqtbuild/bundle/dlls/msvc-64/vcruntime140_1.dll
pyqtbuild/bundle/dlls/openssl-32/libcrypto-1_1.dll
-pyqtbuild/bundle/dlls/openssl-32/libeay32.dll
pyqtbuild/bundle/dlls/openssl-32/libssl-1_1.dll
-pyqtbuild/bundle/dlls/openssl-32/ssleay32.dll
pyqtbuild/bundle/dlls/openssl-64/libcrypto-1_1-x64.dll
-pyqtbuild/bundle/dlls/openssl-64/libeay32.dll
pyqtbuild/bundle/dlls/openssl-64/libssl-1_1-x64.dll
-pyqtbuild/bundle/dlls/openssl-64/ssleay32.dll
pyqtbuild/bundle/packages/__init__.py
pyqtbuild/bundle/packages/pyqt.py
pyqtbuild/bundle/packages/pyqt3d.py
diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py
index c3934e0..3f35a7f 100644
--- a/pyqtbuild/builder.py
+++ b/pyqtbuild/builder.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -140,18 +140,13 @@ class QmakeBuilder(Builder):
# Set the default ABI version of the sip module.
if not project.abi_version:
- # The defaults should really be the .0 versions but we
- # originally didn't specify a minor version so that SIP
- # defaulted to the latest version it knew about (which may vary
- # according to the SIP version). We therefore specify the
- # minimum version needed by the current versions of PyQt at the
- # time of writing. If later versions of PyQt have different
- # requirements then they will explicitly specify the required
- # version.
+ # These are the minimum recommended versions. They usually
+ # correspond to specific functionality that users would expect
+ # to be enabled.
if project.sip_module == 'PyQt5.sip':
- project.abi_version = '12.8'
+ project.abi_version = '12.11'
elif project.sip_module == 'PyQt6.sip':
- project.abi_version = '13.1'
+ project.abi_version = '13.4'
super().apply_user_defaults(tool)
diff --git a/pyqtbuild/bundle/abstract_package.py b/pyqtbuild/bundle/abstract_package.py
index c539064..9f5a593 100644
--- a/pyqtbuild/bundle/abstract_package.py
+++ b/pyqtbuild/bundle/abstract_package.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -25,7 +25,6 @@
from abc import ABC, abstractmethod
import os
import packaging
-import subprocess
from sipbuild import UserException
@@ -45,6 +44,11 @@ class AbstractPackage(ABC):
self.qt_version = self._parse_version(
os.path.basename(os.path.dirname(self._qt_dir)))
+ # We don't support anything older that the current LTS release.
+ if self.qt_version < (5, 15, 0):
+ raise UserException(
+ "Version of Qt older than v5.15 are not supported")
+
# Parse any package version string.
if version_str:
self._version = self._parse_version(version_str)
@@ -114,18 +118,7 @@ class AbstractPackage(ABC):
if bindings:
# Find the bindings.
for ext in module_extensions:
- bindings = os.path.join(package_dir, name + ext)
- if os.path.isfile(bindings):
- if self.qt_version < (5, 15, 0):
- # This isn't necessary for newer wheels built with
- # '--target-qt-dir' but we still have to handle
- # older wheels (ie. using versions of Qt released
- # before '--target-qt-dir' was added.
- if platform_tag.startswith('manylinux'):
- self._fix_linux_rpath(bindings)
- elif platform_tag.startswith('macosx'):
- self._fix_macos_rpath(bindings)
-
+ if os.path.isfile(os.path.join(package_dir, name + ext)):
break
else:
verbose(
@@ -185,60 +178,6 @@ class AbstractPackage(ABC):
return '.'.join([str(v) for v in self.qt_version])
- @classmethod
- def _fix_linux_rpath(cls, bindings):
- """ Fix the rpath for Linux bindings. """
-
- if cls.missing_executable('chrpath'):
- raise UserException("'chrpath' must be installed on your system")
-
- subprocess.run(['chrpath', '--replace', '$ORIGIN/Qt/lib', bindings])
-
- @classmethod
- def _fix_macos_rpath(cls, bindings):
- """ Fix the rpath for macOS bindings. """
-
- if cls.missing_executable('otool') or cls.missing_executable('install_name_tool'):
- raise UserException(
- "'otool' and 'install_name_tool' from Xcode must be "
- "installed on your system")
-
- # Use otool to get all current rpaths.
- pipe = subprocess.Popen('otool -l {}'.format(bindings), shell=True,
- stdout=subprocess.PIPE, universal_newlines=True)
-
- # Delete any existing rpaths.
- args = []
- new_rpath = '@loader_path/Qt/lib'
- add_new_rpath = True
-
- for line in pipe.stdout:
- parts = line.split()
-
- if len(parts) >= 2 and parts[0] == 'path':
- rpath = parts[1]
-
- if rpath == new_rpath:
- add_new_rpath = False
- else:
- args.append('-delete_rpath')
- args.append(rpath)
-
- rc = pipe.wait()
- if rc != 0:
- raise UserException("otool returned a non-zero exit status")
-
- # Add an rpath for the bundled Qt installation if it is not already
- # there.
- if add_new_rpath:
- args.append('-add_rpath')
- args.append('@loader_path/Qt/lib')
-
- if args:
- args.insert(0, 'install_name_tool')
- args.append(bindings)
- subprocess.run(args)
-
@staticmethod
def _parse_version(version_str):
""" Parse a version string as a 3-tuple of major, minor and maintenance
diff --git a/pyqtbuild/bundle/packages/pyqt3d.py b/pyqtbuild/bundle/packages/pyqt3d.py
index c569c89..8eaf658 100755
--- a/pyqtbuild/bundle/packages/pyqt3d.py
+++ b/pyqtbuild/bundle/packages/pyqt3d.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -28,33 +28,29 @@ from ..qt_metadata import VersionedMetadata
# The Qt meta-data for this package.
_QT_METADATA = {
- # Although Qt3D was actually added in Qt v5.6 it wasn't supported by PyQt
- # until v5.7.
'Qt3DAnimation':
- VersionedMetadata(version=(5, 10, 0),
+ VersionedMetadata(
lib_deps={'': ('Qt3DQuickAnimation', )}),
'Qt3DCore':
- VersionedMetadata(version=(5, 7, 0),
+ VersionedMetadata(
lib_deps={'': ('Qt3DQuick', )},
qml=True,
qml_names=('Qt3D', )),
'Qt3DExtras':
- VersionedMetadata(version=(5, 7, 0),
+ VersionedMetadata(
lib_deps={'': ('Qt3DQuickExtras', )}),
- 'Qt3DInput': (
- VersionedMetadata(version=(5, 7, 1),
+ 'Qt3DInput':
+ VersionedMetadata(
lib_deps={'': ('Qt3DQuickInput', 'QtGamepad')}),
- VersionedMetadata(version=(5, 7, 0),
- lib_deps={'': ('Qt3DQuickInput', )})),
'Qt3DLogic':
- VersionedMetadata(version=(5, 7, 0)),
+ VersionedMetadata(),
'Qt3DRender':
- VersionedMetadata(version=(5, 7, 0),
+ VersionedMetadata(
lib_deps={
'win': ('QtConcurrent', ),
'': ('Qt3DQuickRender', 'Qt3DQuickScene2D')}),
diff --git a/pyqtbuild/bundle/packages/pyqt5.py b/pyqtbuild/bundle/packages/pyqt5.py
index 4f868ef..9117e1a 100644
--- a/pyqtbuild/bundle/packages/pyqt5.py
+++ b/pyqtbuild/bundle/packages/pyqt5.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -41,15 +41,12 @@ _QT_METADATA = {
'QtAndroidExtras':
VersionedMetadata(),
- 'QtBluetooth': (
- VersionedMetadata(version=(5, 7, 1),
+ 'QtBluetooth':
+ VersionedMetadata(
lib_deps={
'linux': ('QtConcurrent', ),
'macos': ('QtConcurrent', )},
qml=True),
- VersionedMetadata(
- lib_deps={'macos': ('QtConcurrent', )},
- qml=True)),
'QtCore':
VersionedMetadata(
@@ -70,29 +67,27 @@ _QT_METADATA = {
VersionedMetadata(),
'QtGui':
- VersionedMetadata(lib_deps={'linux': ('QtWaylandClient', 'QtXcbQpa')},
- other_lib_deps={
- 'win': ('d3dcompiler_47.dll', 'libEGL.dll',
- 'libGLESv2.dll', 'opengl32sw.dll')}),
+ VersionedMetadata(
+ lib_deps={'linux': ('QtWaylandClient', 'QtXcbQpa')},
+ other_lib_deps={
+ 'win': ('d3dcompiler_47.dll', 'libEGL.dll', 'libGLESv2.dll',
+ 'opengl32sw.dll')}),
- 'QtHelp': (
- VersionedMetadata(version=(5, 9, 0)),
- VersionedMetadata(lib_deps={'': ('QtCLucene', )})),
+ 'QtHelp':
+ VersionedMetadata(),
- 'QtLocation': (
- VersionedMetadata(version=(5, 11, 0), qml=True,
- lib_deps={'': ('QtPositioningQuick', )}),
- VersionedMetadata(qml=True)),
+ 'QtLocation':
+ VersionedMetadata(
+ lib_deps={'': ('QtPositioningQuick', )},
+ qml=True),
'QtMacExtras':
VersionedMetadata(),
- 'QtMultimedia': (
- VersionedMetadata(version=(5, 10, 0),
- lib_deps={'linux': ('QtMultimediaGstTools', )},
- qml=True, qml_names=('QtAudioEngine', 'QtMultimedia')),
- VersionedMetadata(lib_deps={'win': ('QtMultimediaQuick_p', )},
- qml=True, qml_names=('QtAudioEngine', 'QtMultimedia'))),
+ 'QtMultimedia':
+ VersionedMetadata(
+ lib_deps={'linux': ('QtMultimediaGstTools', )},
+ qml=True, qml_names=('QtAudioEngine', 'QtMultimedia')),
'QtMultimediaWidgets':
VersionedMetadata(),
@@ -101,7 +96,7 @@ _QT_METADATA = {
VersionedMetadata(),
'QtNetworkAuth':
- VersionedMetadata(version=(5, 10, 0), legacy=True),
+ VersionedMetadata(legacy=True),
'QtNfc':
VersionedMetadata(qml=True),
@@ -115,32 +110,31 @@ _QT_METADATA = {
'QtPrintSupport':
VersionedMetadata(),
- 'QtQml': (
- VersionedMetadata(version=(5, 14, 0),
- lib_deps={'': ('QtQmlModels', 'QtQmlWorkerScript')},
- qml=True),
- VersionedMetadata(qml=True)),
+ 'QtQml':
+ VersionedMetadata(
+ lib_deps={'': ('QtQmlModels', 'QtQmlWorkerScript')},
+ qml=True),
'QtQuick':
VersionedMetadata(
- lib_deps={'': ('QtQuickControls2', 'QtQuickParticles',
- 'QtQuickShapes', 'QtQuickTemplates2', 'QtQuickTest')},
- qml=True,
- qml_names=('QtCanvas3D', 'QtGraphicalEffects', 'QtQuick',
- 'QtQuick.2')),
+ lib_deps={'': ('QtQuickControls2', 'QtQuickParticles',
+ 'QtQuickShapes', 'QtQuickTemplates2', 'QtQuickTest')},
+ qml=True,
+ qml_names=('QtCanvas3D', 'QtGraphicalEffects', 'QtQuick',
+ 'QtQuick.2')),
'QtQuick3D':
- VersionedMetadata(version=(5, 15, 0),
- lib_deps={
- '': ('QtQuick3DAssetImport', 'QtQuick3DRender',
- 'QtQuick3DRuntimeRender', 'QtQuick3DUtils')},
- qml=True),
+ VersionedMetadata(
+ lib_deps={
+ '': ('QtQuick3DAssetImport', 'QtQuick3DRender',
+ 'QtQuick3DRuntimeRender', 'QtQuick3DUtils')},
+ qml=True),
'QtQuickWidgets':
VersionedMetadata(),
'QtRemoteObjects':
- VersionedMetadata(version=(5, 12, 0), qml=True),
+ VersionedMetadata(qml=True),
'QtSensors':
VersionedMetadata(qml=True),
@@ -158,7 +152,7 @@ _QT_METADATA = {
VersionedMetadata(qml=True),
'QtTextToSpeech':
- VersionedMetadata(version=(5, 15, 0)),
+ VersionedMetadata(),
'QtWebChannel':
VersionedMetadata(qml=True),
diff --git a/pyqtbuild/bundle/packages/pyqt6_webengine.py b/pyqtbuild/bundle/packages/pyqt6_webengine.py
index d7327a9..35f3c01 100755
--- a/pyqtbuild/bundle/packages/pyqt6_webengine.py
+++ b/pyqtbuild/bundle/packages/pyqt6_webengine.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -30,6 +30,7 @@ from ..qt_metadata import VersionedMetadata
_QT_METADATA = {
'QtWebEngineCore':
VersionedMetadata(version=(6, 2, 0),
+ translations=('qtwebengine', ),
other_lib_deps={
'macos': ('QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Info.plist', )},
exes={
diff --git a/pyqtbuild/bundle/packages/pyqtchart.py b/pyqtbuild/bundle/packages/pyqtchart.py
index 5aa4198..9ac1979 100755
--- a/pyqtbuild/bundle/packages/pyqtchart.py
+++ b/pyqtbuild/bundle/packages/pyqtchart.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -29,8 +29,7 @@ from ..qt_metadata import VersionedMetadata
# The Qt meta-data for this package.
_QT_METADATA = {
'QtChart':
- VersionedMetadata(version=(5, 7, 0), name='QtCharts', qml=True,
- lgpl=False),
+ VersionedMetadata(name='QtCharts', qml=True, lgpl=False),
}
diff --git a/pyqtbuild/bundle/packages/pyqtdatavisualization.py b/pyqtbuild/bundle/packages/pyqtdatavisualization.py
index ae79b9f..d8ef0e2 100755
--- a/pyqtbuild/bundle/packages/pyqtdatavisualization.py
+++ b/pyqtbuild/bundle/packages/pyqtdatavisualization.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -29,8 +29,7 @@ from ..qt_metadata import VersionedMetadata
# The Qt meta-data for this package.
_QT_METADATA = {
'QtDataVisualization':
- VersionedMetadata(version=(5, 7, 0),
- qml=True, lgpl=False),
+ VersionedMetadata(qml=True, lgpl=False),
}
diff --git a/pyqtbuild/bundle/packages/pyqtnetworkauth.py b/pyqtbuild/bundle/packages/pyqtnetworkauth.py
index 5cc2c40..6eb5a32 100755
--- a/pyqtbuild/bundle/packages/pyqtnetworkauth.py
+++ b/pyqtbuild/bundle/packages/pyqtnetworkauth.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -29,8 +29,7 @@ from ..qt_metadata import VersionedMetadata
# The Qt meta-data for this package.
_QT_METADATA = {
'QtNetworkAuth':
- VersionedMetadata(version=(5, 10, 0),
- lgpl=False),
+ VersionedMetadata(lgpl=False),
}
diff --git a/pyqtbuild/bundle/packages/pyqtpurchasing.py b/pyqtbuild/bundle/packages/pyqtpurchasing.py
index 1f081a8..8f6ff1b 100755
--- a/pyqtbuild/bundle/packages/pyqtpurchasing.py
+++ b/pyqtbuild/bundle/packages/pyqtpurchasing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -29,8 +29,7 @@ from ..qt_metadata import VersionedMetadata
# The Qt meta-data for this package.
_QT_METADATA = {
'QtPurchasing':
- VersionedMetadata(version=(5, 7, 0),
- qml=True),
+ VersionedMetadata(qml=True),
}
diff --git a/pyqtbuild/bundle/qt_metadata.py b/pyqtbuild/bundle/qt_metadata.py
index f62a10c..fa51ac1 100644
--- a/pyqtbuild/bundle/qt_metadata.py
+++ b/pyqtbuild/bundle/qt_metadata.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -303,10 +303,6 @@ class VersionedMetadata:
# Note that this assumes the executable is QtWebEngineProcess.
- if qt_version == (5, 6, 0):
- # Replace the incorrect rpath with the correct one.
- subprocess.run(['chrpath', '--replace', '$ORIGIN/../lib', exe])
-
cls._create_qt_conf(exe)
@classmethod
@@ -315,33 +311,22 @@ class VersionedMetadata:
# Note that this assumes the executable is QtWebEngineProcess.
- if qt_version == (5, 6, 0):
- # The rpaths were completly broken in this version.
- subprocess.run(['install_name_tool', '-delete_rpath',
- '@loader_path/../../../../../../../../Frameworks', exe])
- subprocess.run(['install_name_tool', '-delete_rpath',
- '/Users/qt/work/install/lib', exe])
+ # pip doesn't support symbolic links in wheels so the executable will
+ # be installed in its 'logical' location so adjust rpath so that it can
+ # still find the Qt libraries. The required change is simple so we
+ # just patch the binary rather than require install_name_tool. Note
+ # that install_name_tool is now always needed anyway.
+ with open(exe, 'rb') as f:
+ contents = f.read()
- subprocess.run(['install_name_tool', '-add_rpath',
- '@loader_path/../../../../../', exe])
- else:
- # pip doesn't support symbolic links in wheels so the executable
- # will be installed in its 'logical' location so adjust rpath so
- # that it can still find the Qt libraries. The required change is
- # simple so we just patch the binary rather than require
- # install_name_tool. Note that install_name_tool is now always
- # needed anyway.
- with open(exe, 'rb') as f:
- contents = f.read()
-
- contents = contents.replace(b'@loader_path/../../../../../../../',
- b'@loader_path/../../../../../\0\0\0\0\0\0')
-
- with open(exe, 'wb') as f:
- f.write(contents)
-
- if macos_thin_arch == 'arm64':
- subprocess.run(['codesign', '-s', '-', exe])
+ contents = contents.replace(b'@loader_path/../../../../../../../',
+ b'@loader_path/../../../../../\0\0\0\0\0\0')
+
+ with open(exe, 'wb') as f:
+ f.write(contents)
+
+ if macos_thin_arch == 'arm64':
+ subprocess.run(['codesign', '-s', '-', exe])
@classmethod
def _fix_win_executable(cls, exe):
diff --git a/pyqtbuild/version.py b/pyqtbuild/version.py
index bbeeac9..b9cc118 100644
--- a/pyqtbuild/version.py
+++ b/pyqtbuild/version.py
@@ -1,2 +1,2 @@
-PYQTBUILD_VERSION = 0x010c02
-PYQTBUILD_VERSION_STR = '1.12.2'
+PYQTBUILD_VERSION = 0x010d00
+PYQTBUILD_VERSION_STR = '1.13.0'
diff --git a/setup.py b/setup.py
index 0e835d9..3c8d47f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Riverbank Computing Limited
+# Copyright (c) 2022, Riverbank Computing Limited
# All rights reserved.
#
# This copy of PyQt-builder is licensed for use under the terms of the SIP
@@ -48,7 +48,7 @@ setup(
name='PyQt-builder',
version=version,
license='SIP',
- python_requires='>=3.5',
+ python_requires='>=3.7',
install_requires=['packaging', 'sip >=6.3, <7'],
packages=find_packages(),
package_data={
More information about the Neon-commits
mailing list