git: 0ae6b8dc3f2d - main - devel/py-spyder: Update 5.3.3 -> 5.4.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 06 Nov 2022 19:53:59 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ae6b8dc3f2dfb0d0892ea5070d15c9823e2facb

commit 0ae6b8dc3f2dfb0d0892ea5070d15c9823e2facb
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-11-06 19:41:08 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-11-06 19:53:49 +0000

    devel/py-spyder: Update 5.3.3 -> 5.4.0
    
    Reported by:    portscout
---
 devel/py-spyder/Makefile                           | 14 ++++++------
 devel/py-spyder/distinfo                           |  6 ++---
 devel/py-spyder/files/patch-binder_environment.yml | 26 ++++++++++------------
 devel/py-spyder/files/patch-requirements_main.yml  | 25 +++++++++------------
 devel/py-spyder/files/patch-setup.py               | 21 ++++++++---------
 devel/py-spyder/files/patch-spyder_dependencies.py | 25 +++++++++++----------
 6 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index 1aeb4b89d2b5..ec57c2254417 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.3.3
-PORTREVISION=	2
+DISTVERSION=	5.4.0
 CATEGORIES=	devel science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -32,20 +31,21 @@ RUN_DEPENDS=	\
 		${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} \
+		${PYTHON_PKGNAMEPREFIX}pylint-venv>=2.1.1: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} \
 		${PYTHON_PKGNAMEPREFIX}qt5-webengine>0:www/py-qt5-webengine@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-lsp-server>=1.5.0:textproc/py-python-lsp-server@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-lsp-server>0:textproc/py-python-lsp-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.26:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=22.1.0:net/py-pyzmq@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}QDarkStyle>=3.0.2:textproc/py-QDarkStyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.1.10:devel/py-qstylizer@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}QtAwesome>=1.0.2:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}qtconsole>=5.3.2:devel/py-qtconsole@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qstylizer>=0.2.2:devel/py-qstylizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qtconsole>0:devel/py-qtconsole@${PY_FLAVOR} \
 		${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.3.3:devel/py-spyder-kernels@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.0: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/py-spyder/distinfo b/devel/py-spyder/distinfo
index d2b2120d366b..ae870f74bd71 100644
--- a/devel/py-spyder/distinfo
+++ b/devel/py-spyder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665651743
-SHA256 (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 1e59bbddb1846e777e6938d6f600c57466bf8df8c30fdccf17838838b8666ec7
-SIZE (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 24443628
+TIMESTAMP = 1667752855
+SHA256 (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 9e0bfc68baaa420cb894539d07ebab412f03b98499376106191245f14d216b77
+SIZE (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 24497211
diff --git a/devel/py-spyder/files/patch-binder_environment.yml b/devel/py-spyder/files/patch-binder_environment.yml
index 8bf4bcbdb80a..838b4e9c6f95 100644
--- a/devel/py-spyder/files/patch-binder_environment.yml
+++ b/devel/py-spyder/files/patch-binder_environment.yml
@@ -1,20 +1,18 @@
---- binder/environment.yml.orig	2022-08-29 23:48:19 UTC
+--- binder/environment.yml.orig	2022-11-04 20:45:25 UTC
 +++ binder/environment.yml
-@@ -33,7 +33,7 @@ - pyzmq >=22.1.0
- - python-lsp-server >=1.5.0,<1.6.0
+@@ -31,12 +31,12 @@ dependencies:
+ - pyqt <5.16
+ - pyqtwebengine <5.16
+ - python-lsp-black >=1.2.0
+-- python-lsp-server >=1.6.0,<1.7.0
++- python-lsp-server >0
  - pyxdg >=0.26
  - pyzmq >=22.1.0
 -- qdarkstyle >=3.0.2,<3.1.0
 +- qdarkstyle >=3.0.2
- - qstylizer >=0.1.10
- - qtawesome >=1.0.2
- - qtconsole >=5.3.2,<5.4.0
-@@ -41,7 +41,7 @@ - sphinx >=0.6.6
+ - qstylizer >=0.2.2
+-- qtawesome >=1.2.1
++- qtawesome >0
+ - qtconsole >=5.4.0,<5.5.0
+ - 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-requirements_main.yml b/devel/py-spyder/files/patch-requirements_main.yml
index 9cd3f6a77a11..3ed1e779ee88 100644
--- a/devel/py-spyder/files/patch-requirements_main.yml
+++ b/devel/py-spyder/files/patch-requirements_main.yml
@@ -1,20 +1,17 @@
---- requirements/main.yml.orig	2022-08-29 23:48:19 UTC
+--- requirements/main.yml.orig	2022-11-04 20:45:25 UTC
 +++ requirements/main.yml
-@@ -30,7 +30,7 @@ dependencies:
+@@ -29,11 +29,11 @@ dependencies:
+   - pyqt <5.16
+   - pyqtwebengine <5.16
    - python-lsp-black >=1.2.0
-   - python-lsp-server >=1.5.0,<1.6.0
+-  - python-lsp-server >=1.6.0,<1.7.0
++  - python-lsp-server >0
    - pyzmq >=22.1.0
 -  - qdarkstyle >=3.0.2,<3.1.0
 +  - qdarkstyle >=3.0.2
-   - qstylizer >=0.1.10
-   - qtawesome >=1.0.2
-   - qtconsole >=5.3.2,<5.4.0
-@@ -38,7 +38,7 @@ dependencies:
+   - qstylizer >=0.2.2
+-  - qtawesome >=1.2.1
++  - qtawesome >=0
+   - qtconsole >=5.4.0,<5.5.0
+   - 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-setup.py b/devel/py-spyder/files/patch-setup.py
index c8d2aefccc70..92b9fdaca28e 100644
--- a/devel/py-spyder/files/patch-setup.py
+++ b/devel/py-spyder/files/patch-setup.py
@@ -1,4 +1,4 @@
---- setup.py.orig	2022-08-29 23:48:19 UTC
+--- setup.py.orig	2022-11-04 20:45:25 UTC
 +++ setup.py
 @@ -91,7 +91,7 @@ def get_data_files():
      """
@@ -17,25 +17,22 @@
  )
  
  
-@@ -229,17 +228,17 @@ install_requires = [
+@@ -229,13 +228,13 @@ install_requires = [
+     'pyls-spyder>=0.4.0',
      'pyqt5<5.16',
      'pyqtwebengine<5.16',
-     'python-lsp-server[all]>=1.5.0,<1.6.0',
+-    'python-lsp-server[all]>=1.6.0,<1.7.0',
 -    'pyxdg>=0.26;platform_system=="Linux"',
++    'python-lsp-server[all]>0', # maybe dangerous to ignore >=1.6.0,<1.7.0
 +    'pyxdg>=0.26',
      'pyzmq>=22.1.0',
 -    'qdarkstyle>=3.0.2,<3.1.0',
 +    'qdarkstyle>=3.0.2',
-     'qstylizer>=0.1.10',
-     'qtawesome>=1.0.2',
--    'qtconsole>=5.3.2,<5.4.0',
+     'qstylizer>=0.2.2',
+-    'qtawesome>=1.2.1',
+-    'qtconsole>=5.4.0,<5.5.0',
++    'qtawesome', # maybe dangerous to ignore >=1.2.1
 +    'qtconsole',
      '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 a6ab54dc79a7..926bbbeed58a 100644
--- a/devel/py-spyder/files/patch-spyder_dependencies.py
+++ b/devel/py-spyder/files/patch-spyder_dependencies.py
@@ -1,21 +1,22 @@
---- spyder/dependencies.py.orig	2022-08-29 23:48:19 UTC
+--- spyder/dependencies.py.orig	2022-11-04 20:45:25 UTC
 +++ spyder/dependencies.py
-@@ -57,15 +57,15 @@ PYZMQ_REQVER = '>=22.1.0'
+@@ -53,15 +53,15 @@ PSUTIL_REQVER = '>=5.3'
+ PYGMENTS_REQVER = '>=2.0'
+ PYLINT_REQVER = '>=2.5.0;<3.0'
+ PYLINT_VENV_REQVER = '>=2.1.1'
+-PYLSP_REQVER = '>=1.6.0;<1.7.0'
++PYLSP_REQVER = '>0' # until dependency is updated
+ PYLSP_BLACK_REQVER = '>=1.2.0'
  PYLS_SPYDER_REQVER = '>=0.4.0'
  PYXDG_REQVER = '>=0.26'
  PYZMQ_REQVER = '>=22.1.0'
 -QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'
 +QDARKSTYLE_REQVER = '>=3.0.2'
- QSTYLIZER_REQVER = '>=0.1.10'
- QTAWESOME_REQVER = '>=1.0.2'
--QTCONSOLE_REQVER = '>=5.3.2;<5.4.0'
-+QTCONSOLE_REQVER = '>0'
+ QSTYLIZER_REQVER = '>=0.2.2'
+-QTAWESOME_REQVER = '>=1.2.1'
+-QTCONSOLE_REQVER = '>=5.4.0;<5.5.0'
++QTAWESOME_REQVER = '>0' # until dependency is updated
++QTCONSOLE_REQVER = '>0' # until dependency is updated
  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