From e995a85931c84e36ced2114bc2841359d69ec4f7 Mon Sep 17 00:00:00 2001 From: nikooof Date: Wed, 29 Jan 2025 19:49:21 -0800 Subject: [PATCH] pyqt5 version bump --- pyproject.toml | 3 ++- uv.lock | 32 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 02c8bf01..9fe5d9a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,8 @@ dependencies = [ "pyqt5==5.15.11", "setuptools==75.1.0", "sortedcontainers==2.4.0", - "pyqt5-qt5==5.15.2", + "pyqt5-qt5==5.15.15 ; platform_system != 'Windows'", + "pyqt5-qt5==5.15.2 ; platform_system == 'Windows'", "digi-xbee", ] diff --git a/uv.lock b/uv.lock index 17e752b7..d5b71a92 100644 --- a/uv.lock +++ b/uv.lock @@ -3,7 +3,8 @@ requires-python = ">=3.12" resolution-markers = [ "platform_system == 'Darwin'", "platform_machine == 'aarch64' and platform_system == 'Linux'", - "(platform_machine != 'aarch64' and platform_system != 'Darwin') or (platform_system != 'Darwin' and platform_system != 'Linux')", + "(platform_machine != 'aarch64' and platform_system != 'Darwin' and platform_system != 'Windows') or (platform_system != 'Darwin' and platform_system != 'Linux' and platform_system != 'Windows')", + "platform_system == 'Windows'", ] [[package]] @@ -650,7 +651,8 @@ name = "pyqt5" version = "5.15.11" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "pyqt5-qt5" }, + { name = "pyqt5-qt5", version = "5.15.2", source = { registry = "https://pypi.org/simple" }, marker = "platform_system == 'Windows'" }, + { name = "pyqt5-qt5", version = "5.15.15", source = { registry = "https://pypi.org/simple" }, marker = "platform_system != 'Windows'" }, { name = "pyqt5-sip" }, ] sdist = { url = "https://files.pythonhosted.org/packages/0e/07/c9ed0bd428df6f87183fca565a79fee19fa7c88c7f00a7f011ab4379e77a/PyQt5-5.15.11.tar.gz", hash = "sha256:fda45743ebb4a27b4b1a51c6d8ef455c4c1b5d610c90d2934c7802b5c1557c52", size = 3216775 } @@ -666,13 +668,29 @@ wheels = [ name = "pyqt5-qt5" version = "5.15.2" source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "platform_system == 'Windows'", +] wheels = [ - { url = "https://files.pythonhosted.org/packages/62/09/99a222b0360616250fb2e6003a54e43a2a06b0774f0f8d5daafb86a2c375/PyQt5_Qt5-5.15.2-py3-none-macosx_10_13_intel.whl", hash = "sha256:76980cd3d7ae87e3c7a33bfebfaee84448fd650bad6840471d6cae199b56e154", size = 40546019 }, - { url = "https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:1988f364ec8caf87a6ee5d5a3a5210d57539988bf8e84714c7d60972692e2f4a", size = 59921716 }, { url = "https://files.pythonhosted.org/packages/1c/7e/ce7c66a541a105fa98b41d6405fe84940564695e29fc7dccf6d9e8c5f898/PyQt5_Qt5-5.15.2-py3-none-win32.whl", hash = "sha256:9cc7a768b1921f4b982ebc00a318ccb38578e44e45316c7a4a850e953e1dd327", size = 43447358 }, { url = "https://files.pythonhosted.org/packages/37/97/5d3b222b924fa2ed4c2488925155cd0b03fd5d09ee1cfcf7c553c11c9f66/PyQt5_Qt5-5.15.2-py3-none-win_amd64.whl", hash = "sha256:750b78e4dba6bdf1607febedc08738e318ea09e9b10aea9ff0d73073f11f6962", size = 50075158 }, ] +[[package]] +name = "pyqt5-qt5" +version = "5.15.15" +source = { registry = "https://pypi.org/simple" } +resolution-markers = [ + "platform_system == 'Darwin'", + "platform_machine == 'aarch64' and platform_system == 'Linux'", + "(platform_machine != 'aarch64' and platform_system != 'Darwin' and platform_system != 'Windows') or (platform_system != 'Darwin' and platform_system != 'Linux' and platform_system != 'Windows')", +] +wheels = [ + { url = "https://files.pythonhosted.org/packages/4a/6e/a5789bac6310208756fc6a36fd7e01caa86ea6ae7abbb5922dcea003a215/PyQt5_Qt5-5.15.15-py3-none-macosx_10_13_x86_64.whl", hash = "sha256:eb74072935958a830887115b1de1ff26341fc2d5881b28129de39612b10a260e", size = 39147807 }, + { url = "https://files.pythonhosted.org/packages/92/4c/c9026ca280f2cd4bef562cfb0a5050eb23f1e7fe1b85aa8455eb6ea437bf/PyQt5_Qt5-5.15.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:f8b174725fbe29c1a22f8acce5798933a65c8a083f1d9833ff212479ec2b3c14", size = 36953104 }, + { url = "https://files.pythonhosted.org/packages/95/70/1ba9b828387f42e0812b496ed637a950bf57a5d59b844d034841e8f9fb4f/PyQt5_Qt5-5.15.15-py3-none-manylinux2014_x86_64.whl", hash = "sha256:611505d04ffb06a5e5bcf98f5ff0e4e15ba7785565ccbe7bd3b2e40642ea3bdd", size = 59827278 }, +] + [[package]] name = "pyqt5-sip" version = "12.15.0" @@ -833,7 +851,8 @@ dependencies = [ { name = "pyinstaller" }, { name = "pylint" }, { name = "pyqt5" }, - { name = "pyqt5-qt5" }, + { name = "pyqt5-qt5", version = "5.15.2", source = { registry = "https://pypi.org/simple" }, marker = "platform_system == 'Windows'" }, + { name = "pyqt5-qt5", version = "5.15.15", source = { registry = "https://pypi.org/simple" }, marker = "platform_system != 'Windows'" }, { name = "pyserial" }, { name = "pytest" }, { name = "pytest-mock" }, @@ -854,7 +873,8 @@ requires-dist = [ { name = "pyinstaller", specifier = "==6.10" }, { name = "pylint", specifier = "==3.3.1" }, { name = "pyqt5", specifier = "==5.15.11" }, - { name = "pyqt5-qt5", specifier = "==5.15.2" }, + { name = "pyqt5-qt5", marker = "platform_system != 'Windows'", specifier = "==5.15.15" }, + { name = "pyqt5-qt5", marker = "platform_system == 'Windows'", specifier = "==5.15.2" }, { name = "pyserial", specifier = "==3.5" }, { name = "pytest", specifier = "==8.3.3" }, { name = "pytest-mock", specifier = "==3.14.0" },