From nobody Thu Nov 3 21:26:58 2022 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 4N3Gzk3H77z4gnk9; Thu, 3 Nov 2022 21:26:58 +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 4N3Gzk2mrXz3N9K; Thu, 3 Nov 2022 21:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667510818; 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=psVN1k9N26+x2WW68IOQ3VEdkdI7GR+/2KRQjR/Fy3Q=; b=ZIUFkDD5sIevgIB1h2yoAogMPejJ6a2YI/Ue26aagZYdk/8aMEp0T2rMKiD8PIO/Nu/nWX KELjdbujIZNTncYIEeedK6qS2qLAP+zAAXtwsq1hzat2iT8V2Bl/wJ3QoefjG0D+4XuJef OJbbXwikafWkWjJXhxwKSlXMRu28VgfMOdb2WCJbxHom+HE1wuegPQlNzSkGXFqwaSIm5u On9/H+QTkyZlL32swP+iznAx3PYFm/E9bZA2cmEkI7yykCPOP3+zGjkD51baGrG5amSg/g lx6NXKaaV1N0CLfJiJvREbCKXMTd6CO00+CbbORxiTtZBYE/iD4Yy+RBlsmh4g== 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 4N3Gzk1rdnzqs5; Thu, 3 Nov 2022 21:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A3LQwbF068946; Thu, 3 Nov 2022 21:26:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3LQw4B068945; Thu, 3 Nov 2022 21:26:58 GMT (envelope-from git) Date: Thu, 3 Nov 2022 21:26:58 GMT Message-Id: <202211032126.2A3LQw4B068945@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: 6e17af851041 - main - devel/py-spyder: Adaptions for py-spyder-kernels 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: 6e17af851041927ea9a453becd3728e35d38ae5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667510818; 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=psVN1k9N26+x2WW68IOQ3VEdkdI7GR+/2KRQjR/Fy3Q=; b=m07JW9CZaBKDPo99QbRu5XQSHNo20j66b3Ai+QoLGmb+2B8c/9aHzRkvJgwspEn56li3C6 zQQFITahm3a5tgwmEB2nQWFf2VX2zJ25F3aiYGKh05ahljGqMXaigWHOlUtSNxh5wM9Zpn EnZ5+xSQV4YcnMTphI/8OPt2K8g//yYu0f39txx9i2PgG4ynGw4jQV6+JAsRm9A/SVflFd JvpbxsdIllbJj3OpxcjY/oAFiMf0DxT+Y9xj+d0eifMGsSbBnG+X940HOZzjht23qrClsY M0VhklZhE74KedcLcrkF4ton7zdr77w3WVN8+J68mUHdzvWcNNDS4L9qEL3tbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667510818; a=rsa-sha256; cv=none; b=jk2hKY9CJ7yE1vZVayQSdDZQcXlyUrKFPiIUuiBzs+iTftX11a9YyWZ1bzGl8wpYTtmlAB bb76Mv1YexHqJZUCBTbTobiK6k/TpfbunZH+kIta3qIktY0bNIVHNV/5wWm41IoYfzS+O6 Fd8HKyPcn5O+xg6FUnHcjdBJsvvxL96yJyBy02mSKAmsdZJw586b6zRctQOIPGUEXcIOf7 67SBKDabMpxwJm9+YMCQKfj6dzMye38mc8LWXJ/ZjdoO61jW7bzsDgMXeoyLqTwVKhMVGV RAF3fufgAGsebYPeU6MTnbcNVZbD15qciMkInZRNLDHxp5735HWmUbqfTjFj3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e17af851041927ea9a453becd3728e35d38ae5a commit 6e17af851041927ea9a453becd3728e35d38ae5a Author: Rainer Hurling AuthorDate: 2022-11-03 21:17:30 +0000 Commit: Rainer Hurling CommitDate: 2022-11-03 21:25:41 +0000 devel/py-spyder: Adaptions for py-spyder-kernels The new devel/py-spyder-kernels v2.4.0 seems to work fine with this version of Spyder. Agreed with: yuri@ (maintainer) --- devel/py-spyder/Makefile | 2 +- devel/py-spyder/files/patch-binder_environment.yml | 13 +++++++++++-- devel/py-spyder/files/patch-requirements_main.yml | 11 ++++++++++- devel/py-spyder/files/patch-setup.py | 8 +++++++- devel/py-spyder/files/patch-spyder_dependencies.py | 10 ++++++++-- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile index 3194f76d7189..1aeb4b89d2b5 100644 --- a/devel/py-spyder/Makefile +++ b/devel/py-spyder/Makefile @@ -1,7 +1,7 @@ PORTNAME= spyder DISTVERSIONPREFIX= v DISTVERSION= 5.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-spyder/files/patch-binder_environment.yml b/devel/py-spyder/files/patch-binder_environment.yml index f5f454102ee9..8bf4bcbdb80a 100644 --- a/devel/py-spyder/files/patch-binder_environment.yml +++ b/devel/py-spyder/files/patch-binder_environment.yml @@ -1,6 +1,6 @@ ---- binder/environment.yml.orig 2022-10-14 18:00:34 UTC +--- binder/environment.yml.orig 2022-08-29 23:48:19 UTC +++ binder/environment.yml -@@ -33,7 +33,7 @@ dependencies: +@@ -33,7 +33,7 @@ - pyzmq >=22.1.0 - python-lsp-server >=1.5.0,<1.6.0 - pyxdg >=0.26 - pyzmq >=22.1.0 @@ -9,3 +9,12 @@ - qstylizer >=0.1.10 - qtawesome >=1.0.2 - qtconsole >=5.3.2,<5.4.0 +@@ -41,7 +41,7 @@ - sphinx >=0.6.6 + - rtree >=0.9.7 + - setuptools >=49.6.0 + - sphinx >=0.6.6 +-- spyder-kernels >=2.3.3,<2.4.0 ++- spyder-kernels >=2.3.3,<2.4.1 + - textdistance >=4.2.0 + - three-merge >=0.1.1 + - watchdog >=0.10.3 diff --git a/devel/py-spyder/files/patch-requirements_main.yml b/devel/py-spyder/files/patch-requirements_main.yml index cab30c18def6..9cd3f6a77a11 100644 --- a/devel/py-spyder/files/patch-requirements_main.yml +++ b/devel/py-spyder/files/patch-requirements_main.yml @@ -1,4 +1,4 @@ ---- requirements/main.yml.orig 2022-10-14 17:58:24 UTC +--- requirements/main.yml.orig 2022-08-29 23:48:19 UTC +++ requirements/main.yml @@ -30,7 +30,7 @@ dependencies: - python-lsp-black >=1.2.0 @@ -9,3 +9,12 @@ - qstylizer >=0.1.10 - qtawesome >=1.0.2 - qtconsole >=5.3.2,<5.4.0 +@@ -38,7 +38,7 @@ dependencies: + - rtree >=0.9.7 + - setuptools >=49.6.0 + - sphinx >=0.6.6 +- - spyder-kernels >=2.3.3,<2.4.0 ++ - spyder-kernels >=2.3.3,<2.4.1 + - textdistance >=4.2.0 + - three-merge >=0.1.1 + - watchdog >=0.10.3 diff --git a/devel/py-spyder/files/patch-setup.py b/devel/py-spyder/files/patch-setup.py index 0fcd7d5de7a7..c8d2aefccc70 100644 --- a/devel/py-spyder/files/patch-setup.py +++ b/devel/py-spyder/files/patch-setup.py @@ -17,7 +17,7 @@ ) -@@ -229,12 +228,12 @@ install_requires = [ +@@ -229,17 +228,17 @@ install_requires = [ 'pyqt5<5.16', 'pyqtwebengine<5.16', 'python-lsp-server[all]>=1.5.0,<1.6.0', @@ -33,3 +33,9 @@ 'qtpy>=2.1.0', 'rtree>=0.9.7', 'setuptools>=49.6.0', + 'sphinx>=0.6.6', +- 'spyder-kernels>=2.3.3,<2.4.0', ++ 'spyder-kernels>=2.3.3,<2.4.1', + 'textdistance>=4.2.0', + 'three-merge>=0.1.1', + 'watchdog>=0.10.3' diff --git a/devel/py-spyder/files/patch-spyder_dependencies.py b/devel/py-spyder/files/patch-spyder_dependencies.py index 21723e2a6c1f..a6ab54dc79a7 100644 --- a/devel/py-spyder/files/patch-spyder_dependencies.py +++ b/devel/py-spyder/files/patch-spyder_dependencies.py @@ -1,6 +1,6 @@ ---- spyder/dependencies.py.orig 2022-10-15 07:03:54 UTC +--- spyder/dependencies.py.orig 2022-08-29 23:48:19 UTC +++ spyder/dependencies.py -@@ -57,10 +57,10 @@ PYLSP_BLACK_REQVER = '>=1.2.0' +@@ -57,15 +57,15 @@ PYZMQ_REQVER = '>=22.1.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' PYZMQ_REQVER = '>=22.1.0' @@ -13,3 +13,9 @@ QTPY_REQVER = '>=2.1.0' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' + SPHINX_REQVER = '>=0.6.6' +-SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.0' ++SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.1' + TEXTDISTANCE_REQVER = '>=4.2.0' + THREE_MERGE_REQVER = '>=0.1.1' + # None for pynsist install for now