From e464461c195d1dcc2b7eba1dc58e78e03bda97e6 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 12 Jul 2024 20:03:28 +0200 Subject: [PATCH] py-pyqt6: add v6.7.0 (#45212) --- .../repos/builtin/packages/py-pyqt6-sip/package.py | 1 + var/spack/repos/builtin/packages/py-pyqt6/package.py | 9 +++++++-- var/spack/repos/builtin/packages/py-sip/package.py | 11 +++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py b/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py index 36a42e13170..1cd9be94dcb 100644 --- a/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py @@ -14,6 +14,7 @@ class PyPyqt6Sip(PythonPackage): license("GPL-2.0-or-later") + version("13.6.0", sha256="2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778") version("13.5.1", sha256="d1e9141752966669576d04b37ba0b122abbc41cc9c35493751028d7d91c4dd49") depends_on("py-setuptools@30.3:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyqt6/package.py b/var/spack/repos/builtin/packages/py-pyqt6/package.py index 6e6de0ead7c..5c68f7e2761 100644 --- a/var/spack/repos/builtin/packages/py-pyqt6/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt6/package.py @@ -15,15 +15,20 @@ class PyPyqt6(SIPPackage): license("GPL-3.0-or-later") + version("6.7.0", sha256="3d31b2c59dc378ee26e16586d9469842483588142fc377280aad22aaf2fa6235") + version("6.6.1", sha256="9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379") version("6.5.2", sha256="1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280") version("6.5.1", sha256="e166a0568c27bcc8db00271a5043936226690b6a4a74ce0a5caeb408040a97c3") # pyproject.toml - depends_on("py-sip@6.5:6", type="build") + depends_on("python@3.8:", type=("build", "run"), when="@6.7:") + depends_on("py-sip@6.8:6", type="build", when="@6.7:") + depends_on("py-sip@6.5:6", type="build", when="@:6.6") depends_on("py-pyqt-builder@1.15:1", type="build") # PKG-INFO - depends_on("py-pyqt6-sip@13.4:13", type=("build", "run")) + depends_on("py-pyqt6-sip@13.6:13", type=("build", "run"), when="@5.3:") + depends_on("py-pyqt6-sip@13.4:13", type=("build", "run"), when="@:5.2") # README depends_on("qt-base@6") diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index 966f8766fbc..2deda92db09 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -16,6 +16,7 @@ class PySip(PythonPackage): license("GPL-2.0-or-later") + version("6.8.5", sha256="5dddd5966e9875d89ecde9d3e6ac63225f9972e4d25c09e20fa22f1819409c70") version("6.7.9", sha256="35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17") version("6.6.2", sha256="0e3efac1c5dfd8e525ae57140927df26993e13f58b89d1577c314f4105bfd90d") version("6.4.0", sha256="42ec368520b8da4a0987218510b1b520b4981e4405086c1be384733affc2bcb0") @@ -37,14 +38,16 @@ class PySip(PythonPackage): multi=False, ) - depends_on("py-ply", when="@6.6:", type=("build", "run")) + depends_on("py-ply", type=("build", "run"), when="@6.6:") with when("@5:"): depends_on("python", type=("build", "link", "run")) depends_on("py-packaging", type=("build", "run")) - depends_on("py-setuptools@30.3:", type=("build", "run")) - depends_on("py-tomli", when="@6.7: ^python@:3.10", type=("build", "run")) - depends_on("py-toml", when="@:6.6", type=("build", "run")) + depends_on("py-setuptools@64:", type=("build", "run"), when="@6.8.4:") + depends_on("py-setuptools@30.3:", type=("build", "run"), when="@:6.8.3") + depends_on("py-setuptools-scm@8:", type="build", when="@6.8.4:") + depends_on("py-tomli", type=("build", "run"), when="@6.7: ^python@:3.10") + depends_on("py-toml", type=("build", "run"), when="@:6.6") with when("@:4"): # Requires distutils