git: 200b969fbb9e - main - devel/spyder: Relax dependency restriction
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Sep 2023 05:51:33 UTC
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=200b969fbb9e17d44f4c9df47767b60bff6bd2ae commit 200b969fbb9e17d44f4c9df47767b60bff6bd2ae Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2023-09-11 05:11:14 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> 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'