From nobody Sat Mar 9 19:28:41 2024 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 4TsY495qlHz5DnWS; Sat, 9 Mar 2024 19:28:41 +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 4TsY4955m8z4Pmp; Sat, 9 Mar 2024 19:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710012521; 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=kimlEsZJAw8bbg5/fWyqrWoAuzyoFmXT0MBssjL8Pws=; b=qMOAdA3V3pLDSQyoUHdNvsGnY531CVK6MxsWWndPUrWB86Wy7lCHj/VPxpfoN9/3PzF8EX 7cAyNNbyDMofAbsKgVluzkft0NXhuHaA222ozBDX2NVOODIFnXemRNg4he8VYpDfTLtldw bKiHq7jtDnW7QkPWG0WJAflUxme+XRFK/iSUbA/NFKXm11ud32oS8iGNgfUM5m29agdDxO 5fErYzRUwsx+3gHgTuWiQey2uOATsoDupvHV/ad9900XMYMrmTDvpdpzOy9foQO9tT2KKp HFZtiVF2JoNanm3c2ysP7j8kPT9Sp4lw0cwsYyF6OEmo9CUhZhojObsAu9o/cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710012521; a=rsa-sha256; cv=none; b=TzMQbrs296xfm6mUyrLtADQcmTXyza3xbb/lFN8U0FfIEPPl89Eiad8nVJWXRk2QPQ/IBZ ZtVVjUjSz0IHvB2jOYESTTdw1laY4z5bGJOH1R0my4H8944h0vKCv7P5cCeN2vVvTbONXT HL6h9rNN9YXhMH0mFmJL3LzMeMhcZUlkxwafi8Ipsi3Wn1VjFkd3qagGePdCB2AJAMkDHO 1FQmDrV2T8Zd0LlFAuEHDZnE6tmHNBq0DazP9AIXb9MEhCfOhUdFwMLT1YcHKatVm1iip6 GUj8iXJv22mc7gY494mpN4vivStZoCFG/NA2V2sJRS4ta70H9Py2QecjEEr5Aw== 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=1710012521; 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=kimlEsZJAw8bbg5/fWyqrWoAuzyoFmXT0MBssjL8Pws=; b=yzzdG/1cURSq8EakV3DGpVEJSkXU77FIfjiZiV+2Jyx33M3oesqg9/3xlK0h7q41/Ok0Ui Rc9FJzPNcQnGZS/jB1bxrhlhciLYAWo5bVzR5dvuRdaG7jvikSYK3Gl4RmKIwBevpCjHCx hG7Blr8hLmlQPoIQ4DS5BRDYOH8fhl/URBPb+NDi/iWxNfvZyAcBhV/BaKacKczoyUjB4u rA6PtDeDzVOKb0YFBgAadQLSLIvexXbskX+43Dnp73Oh3mjMssL8edPNoKTvTKzY6X3V2B kmJfWGZb0YQMP00tUje06pQeY0MqIa0oU6mkotQHa76qsiexZoZs9gcuQBAqtg== 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 4TsY494j2mz1Cvn; Sat, 9 Mar 2024 19:28:41 +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 429JSfut061379; Sat, 9 Mar 2024 19:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429JSfDw061376; Sat, 9 Mar 2024 19:28:41 GMT (envelope-from git) Date: Sat, 9 Mar 2024 19:28:41 GMT Message-Id: <202403091928.429JSfDw061376@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: 1adb1808210a - 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: 1adb1808210a41cc7503c29346405e07ed88962c Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1adb1808210a41cc7503c29346405e07ed88962c commit 1adb1808210a41cc7503c29346405e07ed88962c Author: Rainer Hurling AuthorDate: 2024-03-09 18:50:11 +0000 Commit: Rainer Hurling CommitDate: 2024-03-09 19:27:57 +0000 devel/spyder: Relax dependency restrictions Again, spyder has to widen its restrictions, this time because of newer versions of devel/pylint and devel/py-spyder-kernels. Approved by: maintainer (blanket for limits like this) --- devel/spyder/Makefile | 5 +++-- devel/spyder/files/patch-binder_environment.yml | 18 ++++++++++++++---- devel/spyder/files/patch-requirements_main.yml | 9 ++++++++- devel/spyder/files/patch-setup.py | 9 ++++++++- devel/spyder/files/patch-spyder_dependencies.py | 7 +++++-- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index 4c561b12413b..1066142f4d02 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,6 +1,7 @@ PORTNAME= spyder DISTVERSIONPREFIX= v DISTVERSION= 5.5.0 +PORTREVISION= 1 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org @@ -29,7 +30,7 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0.4:databases/py-pickleshare@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.3:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \ - pylint${PYTHON_PKGNAMESUFFIX}>=2.5.0:devel/pylint@${PY_FLAVOR} \ + pylint${PYTHON_PKGNAMESUFFIX}>=3.1.0:devel/pylint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pylint-venv>=3.0.2:devel/py-pylint-venv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-lsp-black>=1.2.0:textproc/py-python-lsp-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyls-spyder>=0.4.0:textproc/py-pyls-spyder@${PY_FLAVOR} \ @@ -44,7 +45,7 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}QtPy>=2.1.0:devel/py-QtPy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rtree>=0.9.7:devel/py-rtree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6.6:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.5.0:devel/py-spyder-kernels@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.5.1:devel/py-spyder-kernels@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}textdistance>=4.2.0:textproc/py-textdistance@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}three-merge>=0.1.1:textproc/py-three-merge@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}watchdog>=0.10.3:devel/py-watchdog@${PY_FLAVOR} diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index 766d5ebf899f..83f2f7f742cf 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -1,19 +1,29 @@ --- binder/environment.yml.orig 2023-11-08 03:05:24 UTC +++ binder/environment.yml -@@ -14,7 +14,7 @@ - ipython >=8.13.0,<9.0.0,!=8.17.1 +@@ -13,8 +13,8 @@ - intervaltree >=3.0.2 + - cookiecutter >=1.6.0 - diff-match-patch >=20181111 - intervaltree >=3.0.2 - - ipython >=8.13.0,<9.0.0,!=8.17.1 +-- ipython >=8.13.0,<9.0.0,!=8.17.1 -- jedi >=0.17.2,<0.20.0 ++- ipython >=8.13.0,!=8.17.1 +- jedi >=0.17.2 - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 -@@ -31,18 +31,18 @@ - python-lsp-black >=1.2.0,<3.0.0 +@@ -25,24 +25,24 @@ - pygments >=2.0 + - pickleshare >=0.4 + - psutil >=5.3 + - pygments >=2.0 +-- pylint >=2.5.0,<3.1 ++- pylint >=2.5.0 + - pylint-venv >=3.0.2 + - pyls-spyder >=0.4.0 - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - - python-lsp-black >=1.2.0,<3.0.0 +-- python-lsp-black >=1.2.0,<3.0.0 -- python-lsp-server >=1.9.0,<1.10.0 ++- python-lsp-black >=1.2.0 +- python-lsp-server >=1.9.0 - pyxdg >=0.26 - pyzmq >=22.1.0 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml index e339e1ad19c3..133061b8ce3e 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -9,7 +9,14 @@ - jellyfish >=0.7 - jsonschema >=3.2.0 - keyring >=17.0.0 -@@ -29,17 +29,17 @@ dependencies: +@@ -23,23 +23,23 @@ dependencies: + - pickleshare >=0.4 + - psutil >=5.3 + - pygments >=2.0 +- - pylint >=2.5.0,<3.1 ++ - pylint >=2.5.0 + - pylint-venv >=3.0.2 + - pyls-spyder >=0.4.0 - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=1.2.0,<3.0.0 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index f8a61e29d460..d3b59f20fd68 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -26,7 +26,14 @@ 'jellyfish>=0.7', 'jsonschema>=3.2.0', 'keyring>=17.0.0', -@@ -232,18 +231,18 @@ install_requires = [ +@@ -226,24 +225,24 @@ install_requires = [ + 'pickleshare>=0.4', + 'psutil>=5.3', + 'pygments>=2.0', +- 'pylint>=2.5.0,<3.1', ++ 'pylint>=2.5.0', + 'pylint-venv>=3.0.2', + 'python-lsp-black>=1.2.0,<3.0.0', 'pyls-spyder>=0.4.0', 'pyqt5>=5.10,<5.16', 'pyqtwebengine>=5.10,<5.16', diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py index ad5f1e2f4642..bad0a419f01a 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -9,9 +9,12 @@ JELLYFISH_REQVER = '>=0.7' JSONSCHEMA_REQVER = '>=3.2.0' KEYRING_REQVER = '>=17.0.0' -@@ -58,20 +58,20 @@ PYLINT_VENV_REQVER = '>=3.0.2' +@@ -56,22 +56,22 @@ PYGMENTS_REQVER = '>=2.0' + PICKLESHARE_REQVER = '>=0.4' + PSUTIL_REQVER = '>=5.3' PYGMENTS_REQVER = '>=2.0' - PYLINT_REQVER = '>=2.5.0,<3.1' +-PYLINT_REQVER = '>=2.5.0,<3.1' ++PYLINT_REQVER = '>=2.5.0' PYLINT_VENV_REQVER = '>=3.0.2' -PYLSP_REQVER = '>=1.9.0,<1.10.0' +PYLSP_REQVER = '>=1.9.0'