QuickGraphLib 0.1.0a7__tar.gz → 0.1.0a9__tar.gz

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/CMakeLists.txt

@@ -24,6 +24,6 @@ if(NOT INSTALL_SUBPATH)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Quick Svg)
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.8)
 
 add_subdirectory(QuickGraphLib)

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a7
+Version: 0.1.0a9
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License
@@ -38,8 +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
+Requires-Dist: PySide6==6.8.0.2
 Requires-Dist: contourpy
+Requires-Dist: numpy<2
 Requires-Dist: black; extra == "analyse"
 Requires-Dist: pylint; extra == "analyse"
 Requires-Dist: mypy; extra == "analyse"
@@ -48,8 +49,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.5.3; extra == "analyse"
-Requires-Dist: PySide6==6.5.3; extra == "analyse"
+Requires-Dist: shiboken6_generator==6.8.0.2; extra == "analyse"
 Requires-Dist: setuptools_scm; extra == "analyse"
 Provides-Extra: analyse
 Description-Content-Type: text/markdown
@@ -61,6 +61,7 @@ A scientific graphing library for [QtQuick](https://doc.qt.io/qt-6/qtquick-index
 Links:
  - [Online documentation](https://refeyn.github.io/QuickGraphLib)
  - [PyPI page](https://pypi.org/project/QuickGraphLib/)
+ - [Pre-built artefacts](https://github.com/refeyn/QuickGraphLib/releases/latest)
 
 Key advantages:
 
@@ -75,7 +76,17 @@ Key advantages:
 The example gallery can be run using (provided the Python environment has [PySide6](https://pypi.org/project/PySide6/) and [contourpy](https://pypi.org/project/contourpy/) installed):
 
 ```bash
-python examples\gallery.py
+python examples/gallery.py
 ```
 
 <p align="center"><img src="https://github.com/refeyn/QuickGraphLib/assets/103422031/56fdff62-ef77-4184-9f43-59a76b92d728" width="80%"></p>
+
+## 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.
+
+## 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-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/Axis.qml

@@ -11,6 +11,8 @@ import QuickGraphLib as QuickGraphLib
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Item
     \brief Displays an Axis.
+
+    \sa {Basic sin graph (without prefabs)}, {Graph with all four axes}
 */
 
 Item {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/CMakeLists.txt

@@ -67,10 +67,12 @@ add_custom_target(QuickGraphLibPythonFiles ALL DEPENDS ${QGL_PYTHON_FILES})
 install(
     TARGETS QuickGraphLib
     RUNTIME DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+    LIBRARY DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
 )
 install(
     TARGETS QuickGraphLibPlugin
     RUNTIME DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+    LIBRARY DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
 )
 install(FILES ${QGL_QML_FILES} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
 install(

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/ColorMaps.cpp

@@ -11,6 +11,8 @@
     \inqmlmodule QuickGraphLib
     \inherits QObject
     \brief Utility functions for color maps.
+
+    \sa {ImageView}, {Builtin color maps}, {Color mapped images}
 */
 
 extern const std::map<ColorMaps::ColorMapName, QList<QRgb>> DEFAULT_COLORMAPS;

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphArea.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Shapes::Shape
     \brief An area that graphs can be added to.
+
+    \sa {Basic sin graph (without prefabs)}, {Inverted axes}
 */
 
 QQS.Shape {
@@ -65,7 +67,7 @@ QQS.Shape {
     /*!
         Convert a base transform \a baseTransform into a view transform suitable for \l viewTransform.
     */
-    function viewTransformFromBaseTransform(baseTransform: matrix4x4) {
+    function viewTransformFromBaseTransform(baseTransform: matrix4x4): matrix4x4 {
         return Qt.matrix4x4(baseTransform.m11, baseTransform.m12, baseTransform.m13, baseTransform.m14 * width, baseTransform.m21, baseTransform.m22, baseTransform.m23, baseTransform.m24 * height, baseTransform.m31, baseTransform.m32, baseTransform.m33, baseTransform.m34, baseTransform.m41, baseTransform.m42, baseTransform.m43, baseTransform.m44);
     }
 

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/AxHLine.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a horizontal line.
+
+    \sa {Spans and lines}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/AxHSpan.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a horizontal span.
+
+    \sa {Spans and lines}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/AxVLine.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Rectangle
     \brief Displays an vertical line.
+
+    \sa {Spans and lines}, {Draggable region}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/AxVSpan.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays an vertical span.
+
+    \sa {Spans and lines}, {Basic histogram}, {Draggable region}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/BasicLegend.qml

@@ -10,6 +10,8 @@ import QtQuick
     \brief Displays a simple legend.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items.
+
+    \sa {Basic sin graph}
 */
 
 Rectangle {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/BasicLegendItem.qml

@@ -8,6 +8,8 @@ import QtQuick
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Row
     \brief An single entry in a simple legend.
+
+    \sa {Basic sin graph}
 */
 
 Row {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/CMakeLists.txt

@@ -16,6 +16,7 @@ set(QGL_GI_QML_FILES
     Line.qml
     ColorMesh.qml
 )
+set_source_files_properties(Line.qml PROPERTIES QT_QML_SKIP_CACHEGEN True)
 qt_add_qml_module(QuickGraphLibGraphItems
     URI QuickGraphLib.GraphItems
     SHARED

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/ColorMesh.qml

@@ -11,6 +11,8 @@ import QuickGraphLib as QuickGraphLib
     \brief Display a colorized image from a 2D array.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items.
+
+    \sa {Color mesh}, {Color mapped images}
 */
 
 QuickGraphLib.ImageView {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/Contour.qml

@@ -10,6 +10,8 @@ import QuickGraphLib as QuickGraphLib
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Draw a contour line or fill.
+
+    \sa {Contours}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/GraphItemDragHandler.qml

@@ -8,6 +8,8 @@ import QtQuick
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::MouseArea
     \brief Assists converting mouse drags into data positions.
+
+    \sa {Draggable region}
 */
 
 MouseArea {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/Grid.qml

@@ -10,6 +10,8 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a grid in the background of a graph.
+
+    \sa {Basic sin graph (without prefabs)}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/Histogram.qml

@@ -10,6 +10,8 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a histogram.
+
+    \sa {Basic histogram}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/Line.qml

@@ -13,19 +13,7 @@ import QuickGraphLib as QuickGraphLib
 
     Graph a line using a list of X,Y points. The style of the line can be adjusted using the \l {ShapePath::strokeColor} {strokeColor} and \l {ShapePath::strokeWidth} {strokeWidth} properties.
 
-    \qml
-        GraphArea {
-            id: grapharea
-            viewRect: Qt.rect(-20, -1.1, 760, 2.2)
-
-            Line {
-                dataTransform: grapharea.dataTransform
-                path: Helpers.linspace(0, 720, 100).map(x => Qt.point(x, Math.sin(x / 180 * Math.PI)))
-                strokeColor: "red"
-                strokeWidth: 2
-            }
-        }
-    \endqml
+    \sa {Basic sin graph}
 */
 
 QQS.ShapePath {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/GraphItems/Marker.qml

@@ -10,6 +10,8 @@ import QtQuick
     \brief Displays a circular marker.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items. This is for performance reasons.
+
+    \sa {Scatter graph}
 */
 
 Rectangle {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/ImageView.cpp

@@ -13,6 +13,8 @@
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Item
     \brief Display a colorized image from a 2D array.
+
+    \sa {Builtin color maps}, {Color mapped images}, {Image alignment}
 */
 
 /*!

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/PreFabs/ImageAxes.qml

@@ -11,6 +11,8 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.PreFabs
     \inherits QuickGraphLib::AntialiasingContainer
     \brief Displays an image with axes and a colorbar.
+
+    \sa {Color mesh}
 */
 
 QuickGraphLib.AntialiasingContainer {
@@ -146,12 +148,12 @@ QuickGraphLib.AntialiasingContainer {
                     gradient: Gradient {
                         id: grad
 
-                        property var colors: QuickGraphLib.ColorMaps.colors(colorMesh.colormap)
+                        property var colors: QuickGraphLib.ColorMaps.colors(root.colorMesh.colormap)
 
                         stops: colors.map((color, i) => gradStop.createObject(grad, {
-                                        "color": color,
-                                        "position": i / (colors.length - 1)
-                                    }))
+                                "color": color,
+                                "position": i / (colors.length - 1)
+                            }))
                     }
                 }
                 QuickGraphLib.Axis {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/PreFabs/XYAxes.qml

@@ -11,6 +11,8 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.PreFabs
     \inherits QuickGraphLib::AntialiasingContainer
     \brief Displays an XY axis with a grid.
+
+    \sa {Basic sin graph}, {Dark theme sin graph}, {Subgraphs}
 */
 
 QuickGraphLib.AntialiasingContainer {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/ScalingContainer.qml

@@ -10,6 +10,8 @@ import QtQuick
     \brief Scales its contents while preserving the aspect ratio.
 
     This container applies a scaling factor to its content item that preserves its aspect ratio.
+
+    \sa {Scaled graph}
 */
 
 AntialiasingContainer {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/ShapeRepeater.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib
     \inherits QtQml::Models::Instantiator
     \brief A \l{Repeater}-like component that works with \l{ShapePath}s.
+
+    \sa {Scatter graph}
 */
 
 QQM.Instantiator {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/TickLabel.qml

@@ -11,6 +11,8 @@ import QtQuick
 
     This is the default implementation of a tick label. To customise how labels are shown,
     you can subclass this and override the \l Text::text property.
+
+    \sa {Axis}
 */
 
 Text {

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/ZoomPanHandler.qml

@@ -8,13 +8,15 @@ import QtQuick
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::PinchArea
     \brief Pinch/drag handling for graph or image zoom/pan interactions.
+
+    \sa {Zoomable as image}, {Zoomable axes}
 */
 
 PinchArea {
     id: root
 
     /*!
-        The view transform, but in a pixel-independant form.
+        The view transform, but in a pixel-independent form.
 
         \sa GraphArea::baseTransformFromRect
     */

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/__init__.py

@@ -6,18 +6,19 @@ import os
 import pathlib
 from typing import ContextManager
 
-from PySide6 import QtCore, QtGui, QtQml
+from PySide6 import QtCore, QtGui, QtQml, QtQuick, QtSvg
 
 from ._version import __version__, __version_tuple__
 
 QML_IMPORT_PATH = str(pathlib.Path(__file__).parent.parent)
 
 _dll_path = pathlib.Path(__file__).parent
-os.environ["PATH"] = os.fspath(_dll_path) + os.pathsep + os.environ["PATH"]
 if hasattr(os, "add_dll_directory"):
     cm: ContextManager = os.add_dll_directory(os.fspath(_dll_path))
 else:
     cm = contextlib.nullcontext()
+if os.name == "nt":
+    os.environ["PATH"] = os.fspath(_dll_path) + os.pathsep + os.environ["PATH"]
 with cm:
     from QuickGraphLib._QuickGraphLib import (  # pylint: disable=import-error,no-name-in-module
         QGLDoubleList,

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.0a7'
+__version__ = version = '0.1.0a9'
 __version_tuple__ = version_tuple = (0, 1, 0)

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/bindings/CMakeLists.txt

@@ -5,45 +5,53 @@
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CMAKE_SOURCE_DIR}/venv/Scripts")
 find_package(Python COMPONENTS Interpreter Development.SABIModule REQUIRED)
 
-# Macro to get various pyside / python include / link flags and paths.
-# Uses the not entirely supported utils/pyside_config.py file.
-macro(pyside_config option output_var)
-    if(${ARGC} GREATER 2)
-        set(is_list ${ARGV2})
-    else()
-        set(is_list "")
-    endif()
-
-    execute_process(
-        COMMAND
-            ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/pyside_config.py"
-            ${option}
-        OUTPUT_VARIABLE ${output_var}
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-
-    if("${${output_var}}" STREQUAL "")
-        message(
-            FATAL_ERROR
-            "Error: Calling pyside_config.py ${option} returned no output."
-        )
-    endif()
-    if(is_list)
-        string(REPLACE " " ";" ${output_var} "${${output_var}}")
-    endif()
-endmacro()
-
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside_config(--shiboken-generator-path shiboken_generator_path)
-pyside_config(--pyside-path pyside_path)
-pyside_config(--pyside-include-path pyside_include_dir 1)
-pyside_config(--shiboken-generator-include-path shiboken_include_dir 1)
-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0)
-pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0)
-
-set(shiboken_path
-    "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}"
+set(CMAKE_FIND_DEBUG_MODE TRUE)
+find_program(shiboken_path NAMES shiboken6 REQUIRED)
+find_path(
+    pyside_typesystems_path
+    NAMES PySide6/typesystems
+    PATH_SUFFIXES share
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_path(
+    shiboken_include_dir
+    NAMES sbkpython.h
+    PATH_SUFFIXES shiboken6 shiboken6_generator/include
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_path(
+    pyside_include_dir
+    NAMES pyside.h
+    PATH_SUFFIXES PySide6 PySide6/include
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_library(
+    shiboken_shared_libraries
+    NAMES shiboken6 shiboken6.abi3 libshiboken6.abi3.so.6.8
+    PATH_SUFFIXES shiboken6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+find_library(
+    pyside_shared_library
+    NAMES pyside6 pyside6.abi3 libpyside6.abi3.so.6.8
+    PATH_SUFFIXES PySide6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
 )
+find_library(
+    pyside_qml_shared_library
+    NAMES pyside6qml pyside6qml.abi3 libpyside6qml.abi3.so.6.8
+    PATH_SUFFIXES PySide6
+    PATHS "${Python_SITELIB}"
+    REQUIRED
+)
+set(CMAKE_FIND_DEBUG_MODE FALSE)
+
 if(NOT EXISTS ${shiboken_path})
     message(
         FATAL_ERROR
@@ -55,29 +63,35 @@ if(EXISTS $ENV{LLVM_PATH})
     # Update shiboken's libclang to fix parsing of recent MSVC C++ headers
     configure_file(
         "$ENV{LLVM_PATH}/bin/libclang.dll"
-        "${shiboken_generator_path}/libclang.dll"
+        "${Python_SITELIB}/shiboken6_generator/libclang.dll"
         COPYONLY
     )
 endif()
 
 # Set up the options to pass to shiboken.
 set(INCLUDES "")
-get_property(
-    QT_CORE_INCLUDE_DIRS
-    TARGET Qt6::Core
-    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-foreach(INCLUDE_DIR ${QT_CORE_INCLUDE_DIRS})
-    list(APPEND INCLUDES "-I${INCLUDE_DIR}")
-endforeach()
-get_property(
-    QT_GUI_INCLUDE_DIRS
-    TARGET Qt6::Gui
-    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-foreach(INCLUDE_DIR ${QT_GUI_INCLUDE_DIRS})
-    list(APPEND INCLUDES "-I${INCLUDE_DIR}")
-endforeach()
+if(DEFINED QT_HOST_PATH)
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include")
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include/QtCore")
+    list(APPEND INCLUDES "-I${QT_HOST_PATH}/include/QtGui")
+else()
+    get_property(
+        QT_CORE_INCLUDE_DIRS
+        TARGET Qt6::Core
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    )
+    foreach(INCLUDE_DIR ${QT_CORE_INCLUDE_DIRS})
+        list(APPEND INCLUDES "-I${INCLUDE_DIR}")
+    endforeach()
+    get_property(
+        QT_GUI_INCLUDE_DIRS
+        TARGET Qt6::Gui
+        PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    )
+    foreach(INCLUDE_DIR ${QT_GUI_INCLUDE_DIRS})
+        list(APPEND INCLUDES "-I${INCLUDE_DIR}")
+    endforeach()
+endif()
 
 # We need to include the headers for the module bindings that we use.
 set(pyside_additional_includes "")
@@ -96,7 +110,7 @@ set(shiboken_options
     ${INCLUDES}
     -I${CMAKE_SOURCE_DIR}
     -T${CMAKE_SOURCE_DIR}
-    -T${pyside_path}/typesystems
+    -T${pyside_typesystems_path}/PySide6/typesystems
     --output-directory=${CMAKE_CURRENT_BINARY_DIR}
     --compiler-path=${CMAKE_CXX_COMPILER}
 )
@@ -131,7 +145,7 @@ python_add_library(
     ShibokenHelpers.cpp
     WITH_SOABI
     USE_SABI
-    3.7
+    3.9
 )
 
 # Apply relevant include and link flags.
@@ -148,6 +162,8 @@ target_link_libraries(
     _QuickGraphLib
     PRIVATE
         ${pyside_shared_libraries}
+        ${pyside_shared_library}
+        ${pyside_qml_shared_library}
         ${shiboken_shared_libraries}
         QuickGraphLib
         Qt6::Core

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/bindings/pyigen.py

@@ -22,6 +22,7 @@ else:
     cm = contextlib.nullcontext()
 with cm:
     pyi_generator.PySide6 = PySide6
+    pyi_generator.os = os
     pyi_generator.main()
 
 # Fixup

{quickgraphlib-0.1.0a7 → quickgraphlib-0.1.0a9}/QuickGraphLib/contours.py

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 # SPDX-License-Identifier: MIT
 
-from typing import Sequence
+from typing import Sequence, Tuple
 
 from PySide6 import QtCore, QtQml
 
@@ -27,13 +27,16 @@ def contour_line(
     z: Sequence[Sequence[float]],
     height: float,
 ) -> Sequence[QGLPolygonF]:
+    if not CONTOURPY_AVAILABLE:
+        print("contourpy is not installed, contourLine will not work")
+        return []
+
     gen = contourpy.contour_generator(
         x=x, y=y, z=z, line_type=contourpy.LineType.Separate
     )
     result = []
     for loop in gen.lines(height):
-        assert isinstance(loop, np.ndarray), "Loop is not an array"  # For mypy
-        result.append(QGLPolygonF.fromNDArray(loop))
+        result.append(QGLPolygonF.fromNDArray(loop))  # type: ignore[arg-type]
     return result
 
 
@@ -41,8 +44,12 @@ def contour_fill(
     x: Sequence[Sequence[float]],
     y: Sequence[Sequence[float]],
     z: Sequence[Sequence[float]],
-    heights: tuple[float, float],
+    heights: Tuple[float, float],
 ) -> Sequence[QGLPolygonF]:
+    if not CONTOURPY_AVAILABLE:
+        print("contourpy is not installed, contourFill will not work")
+        return []
+
     gen = contourpy.contour_generator(
         x=x, y=y, z=z, fill_type=contourpy.FillType.OuterOffset
     )