devel/spyder: Update 5.4.0 → 5.4.2

Reported by:	portscout

6 files changed, 29 insertions, 47 deletions

diff --git a/devel/spyder/Makefile b/devel/spyder/Makefile
index 413185ec9323..b3fdf4e0764a 100644
--- a/devel/spyder/Makefile
+++ b/devel/spyder/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.4.0
-PORTREVISION=	2
+DISTVERSION=	5.4.2
 CATEGORIES=	devel science python
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -40,12 +39,12 @@ RUN_DEPENDS=	\
 		${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.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}QtAwesome>=1.2.1:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}qtconsole>=5.4.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.4.0:devel/py-spyder-kernels@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}spyder-kernels>=2.4.2: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/distinfo b/devel/spyder/distinfo
index ae870f74bd71..52feda538016 100644
--- a/devel/spyder/distinfo
+++ b/devel/spyder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667752855
-SHA256 (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 9e0bfc68baaa420cb894539d07ebab412f03b98499376106191245f14d216b77
-SIZE (spyder-ide-spyder-v5.4.0_GH0.tar.gz) = 24497211
+TIMESTAMP = 1679793033
+SHA256 (spyder-ide-spyder-v5.4.2_GH0.tar.gz) = 6011b9cd0a09c8393351548a299d4e0ffa2903a1f1fede7427ed78b89f35f0fc
+SIZE (spyder-ide-spyder-v5.4.2_GH0.tar.gz) = 24523453
diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml
index 838b4e9c6f95..168de394dc37 100644
--- a/devel/spyder/files/patch-binder_environment.yml
+++ b/devel/spyder/files/patch-binder_environment.yml
@@ -1,18 +1,15 @@
---- binder/environment.yml.orig	2022-11-04 20:45:25 UTC
+--- binder/environment.yml.orig	2023-01-18 21:16:10 UTC
 +++ binder/environment.yml
-@@ -31,12 +31,12 @@ dependencies:
+@@ -31,10 +31,10 @@ 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 >=1.7.1,<1.8.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.2.2
--- qtawesome >=1.2.1
-+- qtawesome >0
+ - qtawesome >=1.2.1
  - qtconsole >=5.4.0,<5.5.0
- - qtpy >=2.1.0
- - rtree >=0.9.7
diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml
index 3ed1e779ee88..2c2310dad432 100644
--- a/devel/spyder/files/patch-requirements_main.yml
+++ b/devel/spyder/files/patch-requirements_main.yml
@@ -1,17 +1,14 @@
---- requirements/main.yml.orig	2022-11-04 20:45:25 UTC
+--- requirements/main.yml.orig	2023-01-18 21:16:10 UTC
 +++ requirements/main.yml
-@@ -29,11 +29,11 @@ dependencies:
+@@ -29,9 +29,9 @@ 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
+-  - python-lsp-server >=1.7.1,<1.8.0
++  - python-lsp-server
    - pyzmq >=22.1.0
 -  - qdarkstyle >=3.0.2,<3.1.0
 +  - qdarkstyle >=3.0.2
    - qstylizer >=0.2.2
--  - qtawesome >=1.2.1
-+  - qtawesome >=0
+   - qtawesome >=1.2.1
    - qtconsole >=5.4.0,<5.5.0
-   - qtpy >=2.1.0
-   - rtree >=0.9.7
diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py
index 92b9fdaca28e..e7b8cd97487f 100644
--- a/devel/spyder/files/patch-setup.py
+++ b/devel/spyder/files/patch-setup.py
@@ -1,4 +1,4 @@
---- setup.py.orig	2022-11-04 20:45:25 UTC
+--- setup.py.orig	2023-01-18 21:16:10 UTC
 +++ setup.py
 @@ -91,7 +91,7 @@ def get_data_files():
      """
@@ -17,22 +17,16 @@
  )
  
  
-@@ -229,13 +228,13 @@ install_requires = [
+@@ -229,10 +228,10 @@ install_requires = [
      'pyls-spyder>=0.4.0',
      'pyqt5<5.16',
      'pyqtwebengine<5.16',
--    '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',
+-    'python-lsp-server[all]>=1.7.1,<1.8.0',
++    'python-lsp-server[all]',
+     'pyxdg>=0.26;platform_system=="Linux"',
      'pyzmq>=22.1.0',
 -    'qdarkstyle>=3.0.2,<3.1.0',
 +    'qdarkstyle>=3.0.2',
      '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',
+     'qtawesome>=1.2.1',
+     'qtconsole>=5.4.0,<5.5.0',
diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py
index 926bbbeed58a..31eaedb84652 100644
--- a/devel/spyder/files/patch-spyder_dependencies.py
+++ b/devel/spyder/files/patch-spyder_dependencies.py
@@ -1,11 +1,11 @@
---- spyder/dependencies.py.orig	2022-11-04 20:45:25 UTC
+--- spyder/dependencies.py.orig	2023-01-18 21:16:10 UTC
 +++ spyder/dependencies.py
-@@ -53,15 +53,15 @@ PSUTIL_REQVER = '>=5.3'
+@@ -53,12 +53,12 @@ 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_REQVER = '>=1.7.1;<1.8.0'
++PYLSP_REQVER = '>0'
  PYLSP_BLACK_REQVER = '>=1.2.0'
  PYLS_SPYDER_REQVER = '>=0.4.0'
  PYXDG_REQVER = '>=0.26'
@@ -13,10 +13,5 @@
 -QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'
 +QDARKSTYLE_REQVER = '>=3.0.2'
  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'
+ QTAWESOME_REQVER = '>=1.2.1'
+ QTCONSOLE_REQVER = '>=5.4.0;<5.5.0'