git: 1adb1808210a - main - devel/spyder: Relax dependency restrictions

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rainer Hurling <rhurlin_at_FreeBSD.org>
Date: Sat, 09 Mar 2024 19:28:41 UTC
The branch main has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1adb1808210a41cc7503c29346405e07ed88962c

commit 1adb1808210a41cc7503c29346405e07ed88962c
Author:     Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2024-03-09 18:50:11 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
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'