From nobody Fri Oct 13 19:19:56 2023 X-Original-To: dev-commits-ports-main@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 4S6btP1SL9z4wffD; Fri, 13 Oct 2023 19:19:57 +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 4S6btP0rh6z4VjS; Fri, 13 Oct 2023 19:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697224797; 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=6F0PkCEpcReXHSaRFqFYJcelfdHUVwEtyjDs2svuFdc=; b=r1o06WFtK9iuK0KYuanQ7p2bI+kNnjgDRAR8BYErKWscz2iFG977LP126zAwoVCoYlsylG pH/awdMN4eOO+5ORlTGTFWv/g+gCNmjZF04e0u3zy0ToyxZHAV59MonUpCVcy19Z9ERDa3 W88cYeWSSE89aNK1DqZZCC8US3kS6pfyvht8HBUOFF1l+sL2GLhHJTd0bmOIbp9onksJZJ pvBTVHGOPvdeCPAXDcpis+qZ7zIZRDLkDIU6E+rY2lM1Qnz5QR5cDb9mY4GFlRbF3wV5rF a0zCrytHWTzTA/f5cZwbE7cER1DrPLf45qWxIQwS552puDVB0m609zNMRu8M/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697224797; a=rsa-sha256; cv=none; b=EaGDU9tIyUnu4kYvuroYNrozbA81H6vuyPRT+S9AqRdj80cBMv/aSWf0yw9xgBBU/8Muxx lsXi/H/ujO3vsA5a3HuygBP+t7pANWOuD2+H/jvLkq8uSNnCz89yEDNN9cYiKMPhj8EniJ 23vDNN9f4EqddNBLcj6F/UVsaFVak3E0IixXDwBAxNJcKGU4Xf8iOZvmNIp6P/xDhLVoj0 EE8iEyK62ZqZkE7dioaOic8LcLMEv+4uV8wYbL+McVtSeC77UdH9tRS9vHFHUNPZanT5IB mAE3HCPaxeQjuSV68BZmveE+4jAWheeul1u8lAd8oJ6/5ii9E4VMD5+tSufTxQ== 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=1697224797; 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=6F0PkCEpcReXHSaRFqFYJcelfdHUVwEtyjDs2svuFdc=; b=BzTJor4ieS+I2IDs83aVXeeONFaYCmYcT3XvIDKGvg7qXnfVg7tJQjhEY4yyRAbLniEZ7z y5NSWdKBVzWCTh1AbTgSALIsjwbDoTm8sIsv8gJFLn7vu6nudDsUgXwAG4gKe4nhk2uEjW WFxBw4f1fvFAVakd6TOe2TdQ8WDB8U//LXn1z8bQbYXlu938nvhI7BLWwlkg+wgQHSCQCl JxJNwVaRfzdUJdaih68SHIMNTpYTwy7hUzInP3eByiz/G1uLnGg7PPEn9cVS/1zVqiyZKw IHRkJfarPBvh7gOAqJWzsVYbguL+Www+iMa3GJ67TVklwXNpvA9RG515+x1J7Q== 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 4S6btN7252z10dP; Fri, 13 Oct 2023 19:19:56 +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 39DJJu8p066103; Fri, 13 Oct 2023 19:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DJJumt066100; Fri, 13 Oct 2023 19:19:56 GMT (envelope-from git) Date: Fri, 13 Oct 2023 19:19:56 GMT Message-Id: <202310131919.39DJJumt066100@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: 59c405c21f48 - main - devel/spyder: Fix runtime breakage after 716b52586 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 59c405c21f487192dd61456f1bb3ade06558f6bd Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=59c405c21f487192dd61456f1bb3ade06558f6bd commit 59c405c21f487192dd61456f1bb3ade06558f6bd Author: Rainer Hurling AuthorDate: 2023-10-13 19:07:01 +0000 Commit: Rainer Hurling CommitDate: 2023-10-13 19:07:01 +0000 devel/spyder: Fix runtime breakage after 716b52586 After updating devel/py-jedi to 0.19.1 [1], Spyder no longer starts because it only accepts versions smaller than 0.19.0. Extend this limit. [1] https://cgit.freebsd.org/ports/commit/?id=716b52586fec01517fd49e800c3a1ca2c419cdab Approved by: maintainer (blanket for limits like this) --- devel/spyder/Makefile | 2 +- devel/spyder/files/patch-binder_environment.yml | 9 +++++++++ devel/spyder/files/patch-requirements_main.yml | 9 +++++++++ devel/spyder/files/patch-setup.py | 9 +++++++++ devel/spyder/files/patch-spyder_dependencies.py | 9 +++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index b7d1f3870193..81089ddfeac8 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,7 +1,7 @@ PORTNAME= spyder DISTVERSIONPREFIX= v DISTVERSION= 5.4.5 -DISTREVISION= 1 +DISTREVISION= 2 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml index f15e2837199e..3e0d75249efa 100644 --- a/devel/spyder/files/patch-binder_environment.yml +++ b/devel/spyder/files/patch-binder_environment.yml @@ -1,5 +1,14 @@ --- binder/environment.yml.orig 2023-08-29 21:53:14 UTC +++ binder/environment.yml +@@ -14,7 +14,7 @@ - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8 + - diff-match-patch >=20181111 + - intervaltree >=3.0.2 + - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1 +-- jedi >=0.17.2,<0.19.0 ++- jedi >=0.17.2 + - jellyfish >=0.7 + - jsonschema >=3.2.0 + - keyring >=17.0.0 @@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0 - pyqt <5.16 - pyqtwebengine <5.16 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml index 170dc060dfd9..e59fb0942f78 100644 --- a/devel/spyder/files/patch-requirements_main.yml +++ b/devel/spyder/files/patch-requirements_main.yml @@ -1,5 +1,14 @@ --- requirements/main.yml.orig 2023-08-29 21:53:14 UTC +++ requirements/main.yml +@@ -12,7 +12,7 @@ dependencies: + - diff-match-patch >=20181111 + - intervaltree >=3.0.2 + - ipython >=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1 +- - jedi >=0.17.2,<0.19.0 ++ - jedi >=0.17.2 + - jellyfish >=0.7 + - jsonschema >=3.2.0 + - keyring >=17.0.0 @@ -29,7 +29,7 @@ dependencies: - pyqt <5.16 - pyqtwebengine <5.16 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index c16ad328da5e..a953aa7b10f8 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -17,6 +17,15 @@ ) +@@ -210,7 +209,7 @@ install_requires = [ + 'diff-match-patch>=20181111', + 'intervaltree>=3.0.2', + 'ipython>=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1', +- 'jedi>=0.17.2,<0.19.0', ++ 'jedi>=0.17.2', + 'jellyfish>=0.7', + 'jsonschema>=3.2.0', + 'keyring>=17.0.0', @@ -229,7 +228,7 @@ install_requires = [ 'pyls-spyder>=0.4.0', 'pyqt5<5.16', diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py index 74ab905ef64c..434dac95f9bf 100644 --- a/devel/spyder/files/patch-spyder_dependencies.py +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -1,5 +1,14 @@ --- spyder/dependencies.py.orig 2023-08-29 21:53:14 UTC +++ spyder/dependencies.py +@@ -40,7 +40,7 @@ IPYTHON_REQVER = ( + INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2' + IPYTHON_REQVER = ( + ">=7.31.1,<9.0.0,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1") +-JEDI_REQVER = '>=0.17.2,<0.19.0' ++JEDI_REQVER = '>=0.17.2' + JELLYFISH_REQVER = '>=0.7' + JSONSCHEMA_REQVER = '>=3.2.0' + KEYRING_REQVER = '>=17.0.0' @@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2' PYGMENTS_REQVER = '>=2.0' PYLINT_REQVER = '>=2.5.0,<3.0'