From nobody Tue Dec 12 17:24:19 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SqQTH4dylz54CtP; Tue, 12 Dec 2023 17:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SqQTH2JcFz3JmN; Tue, 12 Dec 2023 17:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702401859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHFhKT+mcfQYqG0OSqMbyMtexH0Tf+xPx5v1r3mj19Q=; b=EORcDLSsjoo/gw0dYrpTZ7jLT7hY6xFmskTNZWBh/xlYY44OdVyZXxYqlTQSsmpJwuZlhY FxmcxkehC05/V2i3+buyh90DS3imvVsNJEWXGLfYcvi9chrcU4eo+ZZ2sInUSDiUtr1Tjd MhDdQ0zsaq8DdiBSNBQKAhI7K9V6oB8QNEepzeCluJMYShad9tk5waO6zS7u1G9iKXZ1ai ztRZ3Z2NUHby47xo+6kBmdvokbSWWXg+a5UF+tyf9DUr2wpIb1MZEx/Q/KY0N6MDtyP/ZE T3pkF3+3QqgnJZPwKvkfGoUWHwo3O6pOn6rpWYiDuyFvq8rvdJF1puqevBVhEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702401859; a=rsa-sha256; cv=none; b=XTqAEt6W7Lj47JDm0139z9kPcRyNOg6G09mf4tu8+6IuonzMa3Mf0+vHmEnCIjp+StOBcL cUPS+FuKGU0dzDR3tE0TlSPmKdpRCJAjQbTA2FUZ3lVE72gm3ptYtSZd5HvfbOXpnIIpY+ L1UsSQoa6B3NiVcfbF9KCuOZXiQoeCCNAzPjYNkyIWs6at+vED8+c1DWNYI4m186U3BIc+ dm3J0veB3IoDKv0/9N7NvwgqvFE6Wc8xvstdmwFLiDRGZeSi84wd6saKh4ifytRBOWcx/K jLWbtplx6kri+sNVOrWUpmA5yhoN+Zi9JNPQYg9JhHLipO95uyfmt8gfQWaBnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702401859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHFhKT+mcfQYqG0OSqMbyMtexH0Tf+xPx5v1r3mj19Q=; b=nZNaKnjV2f3M+22vk0n/oQmR7k5+oqJlGWwUH/g1JAi44Cd0m3L2z42hUkYVOA258OAtnt aVbs8m0MVsQJu/f3sqHTMKqizSFrX5efgHVyvdNwHoFf3+9JWvsBqVF5GwXhiYAI7m9J1d DTtJ8yd11ryIYXn69J7ojAFGSVmqzrQxGHB/bGb5jYR2qPJPWwbPCaqP1rQ2wpKhnPiEUE rs+WXmvNkMd5RJzYn4JR0Q18wSj3vEdjY/z6KC0LeWkbHZn1uEXf6CpCUYl9Gx1VpmeAA+ vnV17f9XGw6RRU/s7hExoBmTs6/E2MNkawIbd2n+HgFVux4pjCkub3py1PAavw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SqQTH1P6Bz8pg; Tue, 12 Dec 2023 17:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BCHOJkY002110; Tue, 12 Dec 2023 17:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BCHOJ4H002106; Tue, 12 Dec 2023 17:24:19 GMT (envelope-from git) Date: Tue, 12 Dec 2023 17:24:19 GMT Message-Id: <202312121724.3BCHOJ4H002106@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 3044a217eb2b - main - devel/spyder: Relax dependency restrictions List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3044a217eb2b7632ebbbc7f569bd731f05017413 Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=3044a217eb2b7632ebbbc7f569bd731f05017413 commit 3044a217eb2b7632ebbbc7f569bd731f05017413 Author: Rainer Hurling AuthorDate: 2023-12-12 16:56:29 +0000 Commit: Rainer Hurling CommitDate: 2023-12-12 17:23:59 +0000 devel/spyder: Relax dependency restrictions Again, spyder has to widen its restrictions because of newer versions of textproc/py-QDarkStyle and devel/py-spyder-kernels. --- devel/spyder/files/patch-binder_environment.yml | 18 +++++++++++++++-- devel/spyder/files/patch-requirements_main.yml | 17 ++++++++++++++-- devel/spyder/files/patch-setup.py | 27 +++++++++++++++++++++++-- devel/spyder/files/patch-spyder_dependencies.py | 18 ++++++++++++++++- 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index 3e0d75249efa..ffb4f4a9eb32 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -9,7 +9,7 @@ - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 -@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0 +@@ -31,18 +31,18 @@ - python-lsp-black >=1.2.0,<3.0.0 - pyqt <5.16 - pyqtwebengine <5.16 - python-lsp-black >=1.2.0,<3.0.0 @@ -17,4 +17,18 @@ +- python-lsp-server >=1.7.4 - pyxdg >=0.26 - pyzmq >=22.1.0 - - qdarkstyle >=3.0.2,<3.2.0 +-- qdarkstyle >=3.0.2,<3.2.0 ++- qdarkstyle >=3.0.2 + - qstylizer >=0.2.2 + - qtawesome >=1.2.1 +-- qtconsole >=5.4.2,<5.5.0 ++- qtconsole >=5.4.2 + - qtpy >=2.1.0 + - rtree >=0.9.7 + - setuptools >=49.6.0 + - sphinx >=0.6.6 +-- spyder-kernels >=2.4.4,<2.5.0 ++- spyder-kernels >=2.4.4 + - textdistance >=4.2.0 + - three-merge >=0.1.1 + - watchdog >=0.10.3 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml index e59fb0942f78..3fab70d7138b 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -9,12 +9,25 @@ - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 -@@ -29,7 +29,7 @@ dependencies: +@@ -29,17 +29,17 @@ dependencies: - pyqt <5.16 - pyqtwebengine <5.16 - python-lsp-black >=1.2.0,<3.0.0 - - python-lsp-server >=1.7.4,<1.8.0 + - python-lsp-server >=1.7.4 - pyzmq >=22.1.0 - - qdarkstyle >=3.0.2,<3.2.0 +- - qdarkstyle >=3.0.2,<3.2.0 ++ - qdarkstyle >=3.0.2 - qstylizer >=0.2.2 + - qtawesome >=1.2.1 +- - qtconsole >=5.4.2,<5.5.0 ++ - qtconsole >=5.4.2 + - qtpy >=2.1.0 + - rtree >=0.9.7 + - setuptools >=49.6.0 + - sphinx >=0.6.6 +- - spyder-kernels >=2.4.4,<2.5.0 ++ - spyder-kernels >=2.4.4 + - textdistance >=4.2.0 + - three-merge >=0.1.1 + - watchdog >=0.10.3 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index a953aa7b10f8..01491362a48d 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -26,7 +26,7 @@ 'jellyfish>=0.7', 'jsonschema>=3.2.0', 'keyring>=17.0.0', -@@ -229,7 +228,7 @@ install_requires = [ +@@ -229,18 +228,18 @@ install_requires = [ 'pyls-spyder>=0.4.0', 'pyqt5<5.16', 'pyqtwebengine<5.16', @@ -34,4 +34,27 @@ + 'python-lsp-server[all]>=1.7.4', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=22.1.0', - 'qdarkstyle>=3.0.2,<3.2.0', +- 'qdarkstyle>=3.0.2,<3.2.0', ++ 'qdarkstyle>=3.0.2', + 'qstylizer>=0.2.2', + 'qtawesome>=1.2.1', +- 'qtconsole>=5.4.2,<5.5.0', ++ 'qtconsole>=5.4.2', + 'qtpy>=2.1.0', + 'rtree>=0.9.7', + 'setuptools>=49.6.0', + 'sphinx>=0.6.6', +- 'spyder-kernels>=2.4.4,<2.5.0', ++ 'spyder-kernels>=2.4.4', + 'textdistance>=4.2.0', + 'three-merge>=0.1.1', + 'watchdog>=0.10.3' +@@ -253,7 +252,7 @@ if 'dev' in __version__: + if req.split(">")[0] not in reqs_to_loosen] + install_requires.append('python-lsp-server[all]>=1.7.4,<1.9.0') + install_requires.append('qtconsole>=5.4.2,<5.6.0') +- install_requires.append('spyder-kernels>=2.4.4,<2.6.0') ++ install_requires.append('spyder-kernels>=2.4.4') + + extras_require = { + 'test:platform_system == "Windows"': ['pywin32'], diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py index 434dac95f9bf..ecd7f92f230b 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -9,7 +9,7 @@ JELLYFISH_REQVER = '>=0.7' JSONSCHEMA_REQVER = '>=3.2.0' KEYRING_REQVER = '>=17.0.0' -@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2' +@@ -54,20 +54,20 @@ PYLINT_VENV_REQVER = '>=3.0.2' PYGMENTS_REQVER = '>=2.0' PYLINT_REQVER = '>=2.5.0,<3.0' PYLINT_VENV_REQVER = '>=3.0.2' @@ -18,3 +18,19 @@ PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' + PYZMQ_REQVER = '>=22.1.0' +-QDARKSTYLE_REQVER = '>=3.0.2,<3.2.0' ++QDARKSTYLE_REQVER = '>=3.0.2' + QSTYLIZER_REQVER = '>=0.2.2' + QTAWESOME_REQVER = '>=1.2.1' +-QTCONSOLE_REQVER = '>=5.4.2,<5.5.0' ++QTCONSOLE_REQVER = '>=5.4.2' + QTPY_REQVER = '>=2.1.0' + RTREE_REQVER = '>=0.9.7' + SETUPTOOLS_REQVER = '>=49.6.0' + SPHINX_REQVER = '>=0.6.6' +-SPYDER_KERNELS_REQVER = '>=2.4.4,<2.5.0' ++SPYDER_KERNELS_REQVER = '>=2.4.4' + TEXTDISTANCE_REQVER = '>=4.2.0' + THREE_MERGE_REQVER = '>=0.1.1' + # None for pynsist install for now