From nobody Mon Sep 11 05:51:33 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 4RkbSP5GxPz4sNpx; Mon, 11 Sep 2023 05:51:33 +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 4RkbSP4rH7z3SRP; Mon, 11 Sep 2023 05:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694411493; 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=HPVUpWfsu12FM5dFGTnMDpj4T15QMv4U8uApS/3dq4U=; b=OuKMNfrvKRLHoPOZ6hB6Vsv8HMfpVc57QBNtE+2VXBYQaSfdHXmd/RVRP8aZgPSZoghJKa VeiuMf6VquU6IFOFMLMIM5Ur4+NAYENkHSgXFNSftP1e3VBHe46VEWFtjFHyfKUfTs7+sP wytxvmJH5kuiX6pIh2GYvJ7BeXgP/POx18ak3zxBh0aJY/Gcs3zYjMoRyKAve4usgfUiFX TaOihquHhcPNCWnw5vmd3I5oL9fF1gB3L4Ta9EDUvNynJFssnXMO/OlGA+EmRq3ZKngweI pl5WYJJrTE/j/kKPV2+WKrV7kzS9RMvMamPO6biyJRsjeuODibSQhOYXrIftKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694411493; a=rsa-sha256; cv=none; b=mbLXAK704QR7xfdnj4zAQfmTpb5c4hBcqAVtRZodsZia07fNfe2d/qWjwd5SrmgzDa5VTI x48CKv6R9YA3D2RKH4+OYFX1VYO8apUKZK7oAx/Gn3pjqRCBfJjuOuUfiHZhRGri6T8V+S QUgj0231L3rELoCWefjp6J7GXLRzPFyLnyEBOs2rMKW7aZ7OVtaAfob/CRNPK7W+M1plDw 1V7e4ZCdiRCkWTehnoHB4b7aDYHatCly+cdST72EnAy3GhWL3zic1bPmkUp3aONuYTUyPd rlyJel1IjKm/RKHQmpVt61IkZjUZh1342lDKfCX8cFK6myw1HHXcEn5QFOi+Yg== 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=1694411493; 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=HPVUpWfsu12FM5dFGTnMDpj4T15QMv4U8uApS/3dq4U=; b=Vv6PIMfMZVXHiTkOdgAUU9YHzgCRe+z2oKDOEMVAQr15amTbpAaVTXejkZ2AzhzyK3k6UK SfgTIsfBz/zbv6qEohqDW2S7pZwz7DOXw1T1qqEgKXO6DfWFG+VCXotMA25E2YzxBcdEIY 3Qd77JIP4x/ZvlBCtY15d6FuFZBIP+37ZpHaBnNXhtOyraAQSaiFCl5lTrZHrCTY+CHyBj SlNZDjgY1lPz+og8ANM91ShJu92vbLlh+9sXRQ4tiqa5BG0vfgL+q5Ae+DDPFfoEpKOq8H A+dy2qA/FMZt3zsQL0bioK84RRlNrmhLGJNXQAHqwQ2cV4XEIK83xAFN0OsAuA== 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 4RkbSP3pR8zcYQ; Mon, 11 Sep 2023 05:51:33 +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 38B5pX3g086494; Mon, 11 Sep 2023 05:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B5pX0C086491; Mon, 11 Sep 2023 05:51:33 GMT (envelope-from git) Date: Mon, 11 Sep 2023 05:51:33 GMT Message-Id: <202309110551.38B5pX0C086491@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: 200b969fbb9e - main - devel/spyder: Relax dependency restriction 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: 200b969fbb9e17d44f4c9df47767b60bff6bd2ae Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=200b969fbb9e17d44f4c9df47767b60bff6bd2ae commit 200b969fbb9e17d44f4c9df47767b60bff6bd2ae Author: Rainer Hurling AuthorDate: 2023-09-11 05:11:14 +0000 Commit: Rainer Hurling CommitDate: 2023-09-11 05:51:19 +0000 devel/spyder: Relax dependency restriction textproc/py-python-lsp-server is now at 1.8.0. Spyder seems to work well with it. --- devel/spyder/Makefile | 1 + devel/spyder/files/patch-binder_environment.yml | 11 +++++++++++ devel/spyder/files/patch-requirements_main.yml | 11 +++++++++++ devel/spyder/files/patch-setup.py | 11 ++++++++++- devel/spyder/files/patch-spyder_dependencies.py | 11 +++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile index 41643eab47a6..b7d1f3870193 100644 --- a/devel/spyder/Makefile +++ b/devel/spyder/Makefile @@ -1,6 +1,7 @@ PORTNAME= spyder DISTVERSIONPREFIX= v DISTVERSION= 5.4.5 +DISTREVISION= 1 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 new file mode 100644 index 000000000000..f15e2837199e --- /dev/null +++ b/devel/spyder/files/patch-binder_environment.yml @@ -0,0 +1,11 @@ +--- binder/environment.yml.orig 2023-08-29 21:53:14 UTC ++++ binder/environment.yml +@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0 + - 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 + - pyxdg >=0.26 + - pyzmq >=22.1.0 + - qdarkstyle >=3.0.2,<3.2.0 diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml new file mode 100644 index 000000000000..170dc060dfd9 --- /dev/null +++ b/devel/spyder/files/patch-requirements_main.yml @@ -0,0 +1,11 @@ +--- requirements/main.yml.orig 2023-08-29 21:53:14 UTC ++++ requirements/main.yml +@@ -29,7 +29,7 @@ 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 + - qstylizer >=0.2.2 diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py index fed581da4710..c16ad328da5e 100644 --- a/devel/spyder/files/patch-setup.py +++ b/devel/spyder/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2023-04-05 02:35:28 UTC +--- setup.py.orig 2023-08-29 21:53:14 UTC +++ setup.py @@ -91,7 +91,7 @@ def get_data_files(): """ @@ -17,3 +17,12 @@ ) +@@ -229,7 +228,7 @@ install_requires = [ + 'pyls-spyder>=0.4.0', + 'pyqt5<5.16', + 'pyqtwebengine<5.16', +- 'python-lsp-server[all]>=1.7.4,<1.8.0', ++ 'python-lsp-server[all]>=1.7.4', + 'pyxdg>=0.26;platform_system=="Linux"', + 'pyzmq>=22.1.0', + 'qdarkstyle>=3.0.2,<3.2.0', diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py new file mode 100644 index 000000000000..74ab905ef64c --- /dev/null +++ b/devel/spyder/files/patch-spyder_dependencies.py @@ -0,0 +1,11 @@ +--- spyder/dependencies.py.orig 2023-08-29 21:53:14 UTC ++++ spyder/dependencies.py +@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2' + PYGMENTS_REQVER = '>=2.0' + PYLINT_REQVER = '>=2.5.0,<3.0' + PYLINT_VENV_REQVER = '>=3.0.2' +-PYLSP_REQVER = '>=1.7.4,<1.8.0' ++PYLSP_REQVER = '>=1.7.4' + PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0' + PYLS_SPYDER_REQVER = '>=0.4.0' + PYXDG_REQVER = '>=0.26'