QuickGraphLib 0.1.0a12__tar.gz → 0.1.0a13__tar.gz

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

@@ -26,6 +26,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.9)
 
 add_subdirectory(QuickGraphLib)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuickGraphLib
-Version: 0.1.0a12
+Version: 0.1.0a13
 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.9.2
 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.9.2; 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.9.2. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.9 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.9.2 exactly. Other 6.9 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.9, the minimum Python version is 3.9.

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/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.0a13/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.0a13'
+__version_tuple__ = version_tuple = (0, 1, 0, 'a13')
+
+__commit_id__ = commit_id = 'g758cc907d'

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/QuickGraphLib/bindings/CMakeLists.txt

@@ -31,21 +31,21 @@ find_path(
 )
 find_library(
     shiboken_shared_libraries
-    NAMES shiboken6 shiboken6.abi3 libshiboken6.abi3.so.6.8
+    NAMES shiboken6 shiboken6.abi3 libshiboken6.abi3.so.6.9
     PATH_SUFFIXES shiboken6
     PATHS "${Python_SITELIB}"
     REQUIRED
 )
 find_library(
     pyside_shared_library
-    NAMES pyside6 pyside6.abi3 libpyside6.abi3.so.6.8
+    NAMES pyside6 pyside6.abi3 libpyside6.abi3.so.6.9
     PATH_SUFFIXES PySide6
     PATHS "${Python_SITELIB}"
     REQUIRED
 )
 find_library(
     pyside_qml_shared_library
-    NAMES pyside6qml pyside6qml.abi3 libpyside6qml.abi3.so.6.8
+    NAMES pyside6qml pyside6qml.abi3 libpyside6qml.abi3.so.6.9
     PATH_SUFFIXES PySide6
     PATHS "${Python_SITELIB}"
     REQUIRED
@@ -59,15 +59,6 @@ if(NOT EXISTS ${shiboken_path})
     )
 endif()
 
-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"
-        "${Python_SITELIB}/shiboken6_generator/libclang.dll"
-        COPYONLY
-    )
-endif()
-
 # Set up the options to pass to shiboken.
 set(INCLUDES "")
 if(DEFINED QT_HOST_PATH)

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/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.0a13}/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.9.2. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.9 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.9.2 exactly. Other 6.9 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.9, the minimum Python version is 3.9.

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/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.9.2",
         qt_arch,
         "-O",
         "./qt",

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/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.9.2/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.0a13}/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.9.2", "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.9.2",
     "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.9.2", "PySide6==6.9.2"]
 build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]
@@ -73,7 +73,6 @@ 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"]
@@ -86,7 +85,6 @@ repair-wheel-command = "cp {wheel} {dest_dir}; wheel tags --remove --platform-ta
 
 [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/"
 LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:$(python ci/find_qt.py)/lib"
 LLVM_INSTALL_DIR = "/usr"
 

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

@@ -31,16 +31,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.9.2
+PySide6-Addons==6.9.2
+PySide6-Essentials==6.9.2
 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.9.2
+shiboken6-generator==6.9.2
 tomli==2.0.1
 tomlkit==0.13.0
 typing_extensions==4.12.2

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/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.0a13}/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>
 

{quickgraphlib-0.1.0a12 → quickgraphlib-0.1.0a13}/tests/reference_images/ReadoutLine.svg

@@ -134,7 +134,7 @@ font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="norma
 >
 <text fill="#000000" fill-opacity="1" stroke="none" xml:space="preserve" x="0" y="14" font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
  >X: -8.00</text>
-<text fill="#000000" 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="#000000" 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" 
  >Y: 0.00</text>
 </g>
 

quickgraphlib-0.1.0a12/QuickGraphLib/_version.py

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