QuickGraphLib 0.1.0a12__tar.gz → 0.1.0a14__tar.gz

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/CMakeLists.txt

@@ -16,6 +16,11 @@ else()
 endif()
 
 option(ENABLE_STUB_GENERATION "Enable .pyi stub generation (defaults to on)" ON)
+option(
+    ENABLE_MANYLINUX_BUILD
+    "Enable workarounds for manylinux build (defaults to off)"
+    OFF
+)
 
 if(NOT INSTALL_SUBPATH)
     set(INSTALL_SUBPATH
@@ -26,6 +31,6 @@ if(NOT INSTALL_SUBPATH)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Quick Svg)
-qt_standard_project_setup(REQUIRES 6.8)
+qt_standard_project_setup(REQUIRES 6.10)
 
 add_subdirectory(QuickGraphLib)

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuickGraphLib
-Version: 0.1.0a12
+Version: 0.1.0a14
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License
@@ -38,9 +38,9 @@ Project-URL: Homepage, https://github.com/refeyn/QuickGraphLib
 Project-URL: Issues, https://github.com/refeyn/QuickGraphLib/issues
 Project-URL: Documentation, https://refeyn.github.io/QuickGraphLib
 Project-URL: Source, https://github.com/refeyn/QuickGraphLib
-Requires-Dist: PySide6==6.8.0.2
+Requires-Dist: PySide6==6.10.0
 Requires-Dist: contourpy
-Requires-Dist: numpy<2
+Requires-Dist: numpy
 Provides-Extra: analyse
 Requires-Dist: black; extra == "analyse"
 Requires-Dist: pylint; extra == "analyse"
@@ -50,7 +50,7 @@ Requires-Dist: lxml; extra == "analyse"
 Requires-Dist: pytest; extra == "analyse"
 Requires-Dist: pytest-cov; extra == "analyse"
 Requires-Dist: scikit-build-core; extra == "analyse"
-Requires-Dist: shiboken6_generator==6.8.0.2; extra == "analyse"
+Requires-Dist: shiboken6_generator==6.10.0; extra == "analyse"
 Requires-Dist: setuptools_scm; extra == "analyse"
 Description-Content-Type: text/markdown
 
@@ -83,10 +83,8 @@ python examples/gallery.py
 
 ## Qt version compatibility
 
-This version of QuickGraphLib is compatible with Qt and PySide6 6.8.0. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.8 and < 7.0. If you use this module from Python, there are some additional features that rely on the PySide6 library version. Therefore the PySide6 version must be 6.8.0.2 exactly. Other 6.8 versions of PySide6 may work, but there are no guarantees.
-
-The pre-built wheels aim to be compatible with the most recent recent Qt LTS version, which is currently 6.8. Pre-built wheels for higher non-LTS Qt versions will likely be available once Qt 6.9 is released.
+This version of QuickGraphLib is compatible with Qt and PySide6 6.10.0. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.10 and < 7.0. If you use this module from Python, there are some additional features that rely on the PySide6 library version. Therefore the PySide6 version must be 6.10.0 exactly. Other 6.10 versions of PySide6 may work, but there are no guarantees.
 
 ## Python version compatibility
 
-QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.8, the minimum Python version is 3.9.
+QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.10, the minimum Python version is 3.9.

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/Axis.qml

@@ -16,10 +16,12 @@ import QuickGraphLib as QuickGraphLib
 
     \section2 Antialiasing
 
-    To turn on high-quality antialiasing, set \l {preferredRendererType} to \c {Shape.CurveRenderer}.
-    This generally results in much better looking graphs, but can also result in rendering problems as the curve renderer is new.
-    It may also require more GPU performance, so switching this back to \c {Shape.GeometryRenderer}
-    may help on low-power systems. See \l {Shape::rendererType} for more details.
+    By default, the axis sets \l {preferredRendererType} to \c {Shape.CurveRenderer}.
+    This turns on high-quality antialiasing, which results in better looking axes on HiDPI systems.
+    However, if you know your application will only be viewed on LoDPI systems, the axes will look
+    slightly better without antialiasing. In addition, antialiasing may require more GPU performance,
+    so switching this back to \c {Shape.GeometryRenderer} may help on low-power systems. See
+    \l {Shape::rendererType} for more details.
 */
 
 Item {
@@ -171,6 +173,7 @@ Item {
         id: shape
 
         anchors.fill: parent
+        preferredRendererType: QQS.Shape.CurveRenderer
 
         QQS.ShapePath {
             id: myPath

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/GraphArea.qml

@@ -14,9 +14,9 @@ import QtQuick.Shapes as QQS
 
     \section2 Antialiasing
 
-    To turn on high-quality antialiasing, set \l {Shape::preferredRendererType} to \c {Shape.CurveRenderer}.
-    This generally results in much better looking graphs, but can also result in rendering problems as the curve renderer is new.
-    It may also require more GPU performance, so switching this back to \c {Shape.GeometryRenderer}
+    By default, the graph area sets \l {Shape::preferredRendererType} to \c {Shape.CurveRenderer}.
+    This turns on high-quality antialiasing, which generally results in much better looking graphs.
+    However, it may require more GPU performance, so switching this back to \c {Shape.GeometryRenderer}
     may help on low-power systems. See \l {Shape::rendererType} for more details.
 */
 
@@ -88,5 +88,6 @@ QQS.Shape {
     clip: true
     // Set initial size to prevent Shape's automatically calculated implicitWidth resulting in binding loops
     height: 100
+    preferredRendererType: QQS.Shape.CurveRenderer
     width: 100
 }

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/GraphItems/Histogram.qml

@@ -11,11 +11,6 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a histogram.
 
-    \warning Rendering of histograms in Qt 6.8 under the curve renderer may include artefacts
-    (see \l {https://bugreports.qt.io/browse/QTBUG-133247}{QTBUG-133247}). If this happens,
-    switch the renderer of the \l GraphArea back to the geometry renderer. This issue should be fixed
-    in a future Qt version.
-
     \sa {Basic histogram}
 */
 

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/ShapeRepeater.qml

@@ -34,23 +34,10 @@ QQM.Instantiator {
     */
     required property QQS.Shape graphArea
 
-    function forceResync() {
-        // Workaround for https://bugreports.qt.io/browse/QTBUG-133230 and https://bugreports.qt.io/browse/QTBUG-133231
-        if (graphArea.Window.window !== null) {
-            let renderer = graphArea.preferredRendererType;
-            let otherRenderer = graphArea.preferredRendererType === QQS.Shape.CurveRenderer ? QQS.Shape.GeometryRenderer : QQS.Shape.CurveRenderer;
-            graphArea.preferredRendererType = otherRenderer;
-            graphArea.ensurePolished();
-            graphArea.preferredRendererType = renderer;
-        }
-    }
-
     onObjectAdded: (i, obj) => {
         QuickGraphLib.ShapeRepeaterHelper.insertObject(graphArea, root, obj, i);
-        forceResync();
     }
     onObjectRemoved: (i, obj) => {
         QuickGraphLib.ShapeRepeaterHelper.removeObject(graphArea, obj);
-        forceResync();
     }
 }

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/ZoomPanHandler.qml

@@ -27,6 +27,9 @@ PinchArea {
     property bool limitMovement: true
     /*!
         Maximum zoom (separate X/Y zoom limits can be set with the width/height of \l size).
+
+        Zooming on a particular axis can be disabled by setting the maximum scale for that axis to 1
+        (provided the minimum scale for that axis is left at its default of 1).
     */
     property size maxScale: Qt.size(10, 10)
     /*!

quickgraphlib-0.1.0a14/QuickGraphLib/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.1.0a14'
+__version_tuple__ = version_tuple = (0, 1, 0, 'a14')
+
+__commit_id__ = commit_id = 'g2b1823e24'

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/bindings/Bindings.xml

@@ -7,9 +7,10 @@
     <load-typesystem name="typesystem_gui.xml" generate="no"/>
     <load-typesystem name="typesystem_quick.xml" generate="no"/>
     <value-type name="QGLDoubleList">
+        <include file-name="../DataTypes.hpp" location="local"/>
         <inject-code class="native" position="beginning">
             #include &lt;sbknumpycheck.h&gt;
-            #include &lt;QuickGraphLib/bindings/ShibokenHelpers.hpp&gt;
+            #include &lt;ShibokenHelpers.hpp&gt;
         </inject-code>
         <add-function signature="fromNDArray(PyArrayObject*@data@)" static="yes" return-type="QGLDoubleList">
             <inject-code file="glue/DataTypes.cpp" snippet="qgldoublelist-fromndarray"/>
@@ -19,13 +20,16 @@
         <modify-function signature="data()const" remove="all"/>
     </value-type>
     <value-type name="QGLPolygonF">
+        <include file-name="../DataTypes.hpp" location="local"/>
         <inject-code class="native" position="beginning">
             #include &lt;sbknumpycheck.h&gt;
-            #include &lt;QuickGraphLib/bindings/ShibokenHelpers.hpp&gt;
+            #include &lt;ShibokenHelpers.hpp&gt;
         </inject-code>
         <add-function signature="fromNDArray(PyArrayObject*@data@)" static="yes" return-type="QGLPolygonF">
             <inject-code file="glue/DataTypes.cpp" snippet="qglpolygonf-fromndarray"/>
         </add-function>
     </value-type>
-    <object-type name="Helpers"/>
+    <object-type name="Helpers">
+        <include file-name="../helpers/Helpers.hpp" location="local"/>
+    </object-type>
 </typesystem>

quickgraphlib-0.1.0a14/QuickGraphLib/bindings/CMakeLists.txt

@@ -0,0 +1,113 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+# SPDX-License-Identifier: MIT
+
+list(APPEND CMAKE_PROGRAM_PATH "${CMAKE_SOURCE_DIR}/venv/Scripts")
+find_package(Python COMPONENTS Interpreter REQUIRED)
+list(APPEND CMAKE_PREFIX_PATH "${Python_SITELIB}/shiboken6_generator/lib/cmake")
+
+if(ENABLE_MANYLINUX_BUILD)
+    # HACK https://bugreports.qt.io/browse/PYSIDE-3233
+    file(
+        READ
+        "${Python_SITELIB}/shiboken6_generator/lib/cmake/Shiboken6Tools/Shiboken6ToolsConfig.cmake"
+        FILE_CONTENTS
+    )
+    string(
+        REPLACE
+        "find_dependency(Python COMPONENTS Interpreter Development)"
+        "find_dependency(Python COMPONENTS Interpreter Development.Module)"
+        FILE_CONTENTS
+        "${FILE_CONTENTS}"
+    )
+    file(
+        WRITE
+        "${Python_SITELIB}/shiboken6_generator/lib/cmake/Shiboken6Tools/Shiboken6ToolsConfig.cmake"
+        "${FILE_CONTENTS}"
+    )
+    file(
+        READ
+        "${Python_SITELIB}/shiboken6/lib/cmake/Shiboken6/ShibokenHelpers.cmake"
+        FILE_CONTENTS
+    )
+    string(
+        REPLACE
+        "COMPONENTS Interpreter Development\n"
+        "COMPONENTS Interpreter Development.Module\n"
+        FILE_CONTENTS
+        "${FILE_CONTENTS}"
+    )
+    file(
+        WRITE
+        "${Python_SITELIB}/shiboken6/lib/cmake/Shiboken6/ShibokenHelpers.cmake"
+        "${FILE_CONTENTS}"
+    )
+endif()
+
+if(CMAKE_CROSSCOMPILING)
+    find_package(Shiboken6 REQUIRED)
+    find_package(PySide6 REQUIRED)
+
+    get_target_property(
+        qt_platform_includes
+        Qt6::Platform
+        INTERFACE_INCLUDE_DIRECTORIES
+    )
+    get_target_property(
+        qt_core_includes
+        Qt6::Core
+        INTERFACE_INCLUDE_DIRECTORIES
+    )
+    set(force_process_list ${qt_platform_includes} ${qt_core_includes})
+    string(REPLACE ";" ":" force_process_paths "${force_process_list}")
+    set(shiboken_options
+        "--platform=${CMAKE_SYSTEM_NAME}"
+        "--arch=${CMAKE_SYSTEM_PROCESSOR}"
+        "--compiler-path=${CMAKE_CXX_COMPILER}"
+        "--compiler-argument=--sysroot=${CMAKE_SYSROOT}"
+        "--force-process-system-include-paths=${force_process_paths}"
+    )
+endif()
+
+find_package(Shiboken6Tools REQUIRED)
+
+shiboken_generator_create_binding(
+    EXTENSION_TARGET _QuickGraphLib
+    GENERATED_SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib/_QuickGraphLib/_quickgraphlib_module_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib/_QuickGraphLib/qglpolygonf_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib/_QuickGraphLib/qgldoublelist_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib/_QuickGraphLib/helpers_wrapper.cpp
+    HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Bindings.hpp
+    TYPESYSTEM_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings.xml
+    LIBRARY_TARGET QuickGraphLib
+    FORCE_LIMITED_API
+    QT_MODULES Core Gui Qml Quick Network OpenGL
+    SHIBOKEN_EXTRA_OPTIONS ${shiboken_options}
+)
+target_sources(
+    _QuickGraphLib
+    PRIVATE Bindings.hpp ShibokenHelpers.hpp ShibokenHelpers.cpp
+)
+
+# Generate .pyi stub file
+if(ENABLE_STUB_GENERATION)
+    set(pyi_path ${CMAKE_BINARY_DIR}/QuickGraphLib/_QuickGraphLib.pyi)
+    add_custom_command(
+        OUTPUT ${pyi_path}
+        COMMAND
+            "${Python_EXECUTABLE}" ${CMAKE_CURRENT_SOURCE_DIR}/pyigen.py
+            $<TARGET_FILE:_QuickGraphLib> --outpath
+            ${CMAKE_BINARY_DIR}/QuickGraphLib
+        DEPENDS
+            $<TARGET_FILE:_QuickGraphLib>
+            ${CMAKE_CURRENT_SOURCE_DIR}/pyigen.py
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Running stub generation for for _QuickGraphLib."
+    )
+
+    add_custom_target(QuickGraphLibPythonStubs ALL DEPENDS ${pyi_path})
+endif()
+
+# Install files
+install(TARGETS _QuickGraphLib DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
+install(FILES ${pyi_path} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/bindings/pyigen.py

@@ -36,9 +36,9 @@ text = (
     path.read_text(encoding="utf-8")
     .replace(
         "import _QuickGraphLib",
-        "import QuickGraphLib._QuickGraphLib\nimport numpy\nimport typing",
+        "import QuickGraphLib._QuickGraphLib\nimport numpy",
     )
-    .replace("shibokensupport.signature.mapping.ArrayLikeVariable", "numpy.ndarray")
+    .replace("collections.abc.Sequence[typing.Any]", "numpy.ndarray")
 )
-text = re.sub(r"'(.*,.*)'", r"Union[\1]", text)
+text = re.sub(r"'(.*,.*)'", r"typing.Union[\1]", text)
 path.write_text(text, encoding="utf-8")

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/QuickGraphLib/helpers/Helpers.cpp

@@ -335,10 +335,10 @@ void exportItemToPainter(QQuickItem* item, QPainter* painter) {
         if (imageView->smooth()) {
             painter->setRenderHint(QPainter::RenderHint::SmoothPixmapTransform, true);
         }
-        painter->drawImage(
-            imageView->paintedRect(),
-            imageView->image().mirrored(imageView->mirrorHorizontally(), imageView->mirrorVertically())
-        );
+        auto flippedFlags = Qt::Orientations();
+        flippedFlags.setFlag(Qt::Horizontal, imageView->mirrorHorizontally());
+        flippedFlags.setFlag(Qt::Vertical, imageView->mirrorVertically());
+        painter->drawImage(imageView->paintedRect(), imageView->image().flipped(flippedFlags));
     }
 
     for (auto c : children) {

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/README.md

@@ -27,10 +27,8 @@ python examples/gallery.py
 
 ## Qt version compatibility
 
-This version of QuickGraphLib is compatible with Qt and PySide6 6.8.0. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.8 and < 7.0. If you use this module from Python, there are some additional features that rely on the PySide6 library version. Therefore the PySide6 version must be 6.8.0.2 exactly. Other 6.8 versions of PySide6 may work, but there are no guarantees.
-
-The pre-built wheels aim to be compatible with the most recent recent Qt LTS version, which is currently 6.8. Pre-built wheels for higher non-LTS Qt versions will likely be available once Qt 6.9 is released.
+This version of QuickGraphLib is compatible with Qt and PySide6 6.10.0. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.10 and < 7.0. If you use this module from Python, there are some additional features that rely on the PySide6 library version. Therefore the PySide6 version must be 6.10.0 exactly. Other 6.10 versions of PySide6 may work, but there are no guarantees.
 
 ## Python version compatibility
 
-QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.8, the minimum Python version is 3.9.
+QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.10, the minimum Python version is 3.9.

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/ci/setup_qt.py

@@ -19,14 +19,28 @@ elif sys.platform == "darwin":
 else:
     raise RuntimeError(f"Unknown platform {sys.platform}")
 
-subprocess.run(["pip", "install", "aqtinstall==3.1.*"], check=True)
+if sys.platform == "linux":
+    prefix = "/opt/python/cp312-cp312/bin/"
+else:
+    prefix = ""
+
+subprocess.run(
+    [
+        f"{prefix}pip",
+        "install",
+        "aqtinstall==3.3.*",
+    ],
+    check=True,
+)
 subprocess.run(
     [
+        f"{prefix}python",
+        "-m",
         "aqt",
         "install-qt",
         qt_platform,
         "desktop",
-        "6.8.0",
+        "6.10.0",
         qt_arch,
         "-O",
         "./qt",

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/docs/build_docs.py

@@ -15,7 +15,7 @@ IGNORED_LINES = [
     "In file included from",
 ]
 
-QT_PATH = pathlib.Path(os.environ.get("QT_ROOT_DIR", "C:/Qt/6.8.0/msvc2022_64"))
+QT_PATH = pathlib.Path(os.environ.get("QT_ROOT_DIR", "C:/Qt/6.10.0/msvc2022_64"))
 QT_VERSION = QT_PATH.parts[-2]
 QDOC_PATH = QT_PATH / "bin/qdoc.exe"
 INDEX_PATH = QT_PATH.parent.parent / ("Docs/Qt-" + QT_VERSION)

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/pyproject.toml

@@ -4,7 +4,7 @@ description = "A scientific graphing library for QtQuick"
 readme = "README.md"
 license = { file = "LICENCE" }
 authors = [{ name = "Matthew Joyce", email = "matthew.joyce@refeyn.com" }]
-dependencies = ["PySide6==6.8.0.2", "contourpy", "numpy<2"]
+dependencies = ["PySide6==6.10.0", "contourpy", "numpy"]
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Environment :: X11 Applications :: Qt",
@@ -38,12 +38,12 @@ analyse = [
     "pytest-cov",
     # Building
     "scikit-build-core",
-    "shiboken6_generator==6.8.0.2",
+    "shiboken6_generator==6.10.0",
     "setuptools_scm",
 ]
 
 [build-system]
-requires = ["scikit-build-core", "shiboken6_generator==6.8.0.2", "PySide6==6.8.0.2"]
+requires = ["scikit-build-core", "shiboken6_generator==6.10.0", "PySide6==6.10.0"]
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]
@@ -73,20 +73,18 @@ test-extras = ["analyse"]
 
 [tool.cibuildwheel.environment]
 SKBUILD_CMAKE_DEFINE = "CMAKE_PREFIX_PATH=\"$(python ci/find_qt.py)/lib/cmake\""
-PIP_EXTRA_INDEX_URL = "https://download.qt.io/official_releases/QtForPython/"
 
 [tool.cibuildwheel.macos]
 archs = ["universal2"]
 
 [tool.cibuildwheel.linux]
 archs = ["x86_64"]                                                                                                   # , "aarch64"]
-manylinux-x86_64-image = "manylinux_2_28"
-manylinux-aarch64-image = "manylinux_2_28"
-repair-wheel-command = "cp {wheel} {dest_dir}; wheel tags --remove --platform-tag $AUDITWHEEL_PLAT {dest_dir}/*.whl"
+manylinux-x86_64-image = "quay.io/pypa/manylinux_2_34_x86_64"
+manylinux-aarch64-image = "quay.io/pypa/manylinux_2_39_aarch64"
+repair-wheel-command = "cp {wheel} {dest_dir}; pip install wheel; wheel tags --remove --platform-tag $AUDITWHEEL_PLAT {dest_dir}/*.whl"
 
 [tool.cibuildwheel.linux.environment]
-SKBUILD_CMAKE_DEFINE = "CMAKE_PREFIX_PATH=\"$(python ci/find_qt.py)/lib/cmake\""
-PIP_EXTRA_INDEX_URL = "https://download.qt.io/official_releases/QtForPython/"
+SKBUILD_CMAKE_DEFINE = "CMAKE_PREFIX_PATH=\"$(python ci/find_qt.py)/lib/cmake\";ENABLE_MANYLINUX_BUILD=ON"
 LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:$(python ci/find_qt.py)/lib"
 LLVM_INSTALL_DIR = "/usr"
 

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/requirements.txt

@@ -1,4 +1,3 @@
---extra-index-url=https://download.qt.io/official_releases/QtForPython/
 appdirs==1.4.4
 astroid==3.2.4
 black==24.4.2
@@ -31,16 +30,16 @@ pluggy==1.5.0
 pre-commit==3.7.1
 pylint==3.2.6
 pyproject_hooks==1.1.0
-PySide6==6.8.0.2
-PySide6-Addons==6.8.0.2
-PySide6-Essentials==6.8.0.2
+PySide6==6.10.0
+PySide6-Addons==6.10.0
+PySide6-Essentials==6.10.0
 pytest==8.3.1
 pytest-cov==5.0.0
 PyYAML==6.0.1
 scikit_build_core==0.9.8
 setuptools-scm==8.1.0
-shiboken6==6.8.0.2
-shiboken6-generator==6.8.0.2
+shiboken6==6.10.0
+shiboken6-generator==6.10.0
 tomli==2.0.1
 tomlkit==0.13.0
 typing_extensions==4.12.2

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/tests/python_exporter.py

@@ -5,7 +5,7 @@ import contextlib
 import pathlib
 from typing import Any, Iterator
 
-from PySide6 import QtCore, QtQml, QtQuick
+from PySide6 import QtCore, QtGui, QtQml, QtQuick
 
 import QuickGraphLib
 
@@ -63,16 +63,29 @@ def export(
 
     # Bit of funkyness to make sure the items get polished (e.g. laid out properly)
     # which won't happen automatically if we use async incubation
+    rhi = QtGui.QRhi.create(QtGui.QRhi.Implementation.Null, QtGui.QRhiNullInitParams())
+    texture = rhi.newTexture(
+        QtGui.QRhiTexture.Format.RGBA8,
+        QtCore.QSize(int(width), int(height)),
+        1,
+        QtGui.QRhiTexture.Flag.RenderTarget,
+    )
+    texture.create()
+    rendertarget = rhi.newTextureRenderTarget(
+        QtGui.QRhiTextureRenderTargetDescription(texture)
+    )
+    rendertarget.setRenderPassDescriptor(
+        rendertarget.newCompatibleRenderPassDescriptor()
+    )
     rendercontrol = QtQuick.QQuickRenderControl()
     window = QtQuick.QQuickWindow(rendercontrol)
-    window.setRenderTarget(QtQuick.QQuickRenderTarget())
+    window.setRenderTarget(QtQuick.QQuickRenderTarget.fromRhiRenderTarget(rendertarget))
     window.resize(int(width), int(height))
-    window.create()
     item.setParentItem(window.contentItem())
     rendercontrol.polishItems()
 
     yield item
 
     # Cleanup
-    window.destroy()
     item.setParentItem(None)  # type: ignore[arg-type]
+    rendertarget.destroy()

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a14}/tests/reference_images/Complex.svg

@@ -148,7 +148,7 @@ font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="norma
 >
 <text fill="#a52a2a" fill-opacity="1" stroke="none" xml:space="preserve" x="8.5" y="14" font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
  >I'm an</text>
-<text fill="#a52a2a" fill-opacity="1" stroke="none" xml:space="preserve" x="0" y="32" font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
+<text fill="#a52a2a" fill-opacity="1" stroke="none" xml:space="preserve" x="0" y="31" font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
  >axvspan</text>
 </g>
 
@@ -1076,7 +1076,7 @@ font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="norma
 >
 </g>
 
-<g fill="#e4e4e4" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,83,573)"
+<g fill="#e4e4e4" fill-opacity="1" stroke="none" transform="matrix(1,0,0,1,83,573)"
 font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
 >
 <path vector-effect="none" fill-rule="evenodd" d="M0,3 C0,1.34315 1.34315,0 3,0 L185,0 C186.657,0 188,1.34315 188,3 C188,4.65685 186.657,6 185,6 L3,6 C1.34315,6 0,4.65685 0,3 "/>
@@ -1171,7 +1171,7 @@ font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="norma
 >
 </g>
 
-<g fill="#e4e4e4" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(1,0,0,1,382,573)"
+<g fill="#e4e4e4" fill-opacity="1" stroke="none" transform="matrix(1,0,0,1,382,573)"
 font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
 >
 <path vector-effect="none" fill-rule="evenodd" d="M0,3 C0,1.34315 1.34315,0 3,0 L185,0 C186.657,0 188,1.34315 188,3 C188,4.65685 186.657,6 185,6 L3,6 C1.34315,6 0,4.65685 0,3 "/>