devel/py-spyder: Update 3.2.7 -> 5.3.3

6 files changed, 118 insertions, 67 deletions

diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index a16c10fcdd6a..52eb7030a26b 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -1,73 +1,63 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.7
-PORTREVISION=	14
+DISTVERSION=	5.3.3
 CATEGORIES=	devel science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
-WWW=		https://github.com/spyder-ide/spyder/
+WWW=		https://www.spyder-ide.org/
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}QtAwesome>0:x11-fonts/py-QtAwesome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}QtPy>=1.3.1:devel/py-QtPy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.3.1:devel/py-cloudpickle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jedi>=0.9.0:devel/py-jedi@${PY_FLAVOR} \
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	\
+		${PYTHON_PKGNAMEPREFIX}atomicwrites>=1.2.0:devel/py-atomicwrites@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}chardet>=2.0.0:textproc/py-chardet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cloudpickle>=0.5.0:devel/py-cloudpickle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cookiecutter>=1.6.0:devel/py-cookiecutter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=20181111:textproc/py-diff-match-patch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.2:devel/py-intervaltree@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipython>=7.31.1:devel/ipython@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jedi>=0.17.2:devel/py-jedi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jellyfish>=0.7:devel/py-jellyfish@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.2.0:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keyring>=17.0.0:security/py-keyring@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nbconvert>=4.0:devel/py-nbconvert@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}qtconsole>=4.3.0:devel/py-qtconsole@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpydoc>0:textproc/py-numpydoc@${PY_FLAVOR} \
-		pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parso>=0.1.1:textproc/py-parso@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6.0:textproc/py-numpydoc@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parso>=0.7.0:textproc/py-parso@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>=4.4.0:misc/py-pexpect@${PY_FLAVOR} \
+		${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} \
+		${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}pyxdg>=0.26:devel/py-pyxdg@${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}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}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}
 
 USES=		desktop-file-utils python:3.7+ pyqt:5
+USE_PYTHON=	distutils concurrent autoplist noflavors
+USE_PYQT=	pyqt5 sip
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	spyder-ide
-USE_PYTHON=	distutils autoplist noflavors
-USE_PYQT=	pyqt5 sip
+
 NO_ARCH=	yes
 
 DOCSDIR=	${PYTHON_SITELIBDIR}/spyder
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_GROUP=	RECOMMENDED OPTIONAL
-OPTIONS_GROUP_RECOMMENDED=	IPYTHON MATPLOT NUMPY PSUTIL PYFLAKES ROPE SCIPY SPHINX
-OPTIONS_GROUP_OPTIONAL=	PANDAS PYGMENTS SYMPY
-OPTIONS_DEFAULT=	IPYTHON MATPLOT NUMPY PSUTIL PYFLAKES ROPE SCIPY SPHINX
-
-IPYTHON_DESC=	IPython Console integration
-MATPLOT_DESC=	Interactive data plotting in the consoles
-NUMPY_DESC=	N-dimensional arrays
-PANDAS_DESC=	View and edit DataFrames and Series in the Variable Explorer
-PSUTIL_DESC=	CPU and memory usage info in the status bar
-PYFLAKES_DESC=	Real-time code analysis on the Editor
-PYGMENTS_DESC=	Syntax highlighting for Matlab, Julia and other file types
-ROPE_DESC=	Editor's code completion, go-to-definition and help
-SCIPY_DESC=	Signal/image processing
-SPHINX_DESC=	Rich text help on the Object Inspector
-SYMPY_DESC=	Symbolic mathematics in the IPython Console
-
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=6.0:devel/ipython@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${PY_FLAVOR}
-MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${PY_FLAVOR}
-NUMPY_RUN_DEPENDS=	${PYNUMPY}
-PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${PY_FLAVOR}
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${PY_FLAVOR}
-PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${PY_FLAVOR}
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
-ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${PY_FLAVOR}
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
-SPHINX_RUN_DEPENDS=	${DOCS_BUILD_DEPENDS}
-SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy@${PY_FLAVOR}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|g" \
-		${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e "s|cmdclass=CMDCLASS||g" ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
diff --git a/devel/py-spyder/distinfo b/devel/py-spyder/distinfo
index fe5e35646bf0..d2b2120d366b 100644
--- a/devel/py-spyder/distinfo
+++ b/devel/py-spyder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519708244
-SHA256 (spyder-ide-spyder-v3.2.7_GH0.tar.gz) = 5e53705179b57680796b9c095556d30fdfe41b359bbcffea94a6ea1929b0d6dd
-SIZE (spyder-ide-spyder-v3.2.7_GH0.tar.gz) = 4906058
+TIMESTAMP = 1665651743
+SHA256 (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 1e59bbddb1846e777e6938d6f600c57466bf8df8c30fdccf17838838b8666ec7
+SIZE (spyder-ide-spyder-v5.3.3_GH0.tar.gz) = 24443628
diff --git a/devel/py-spyder/files/patch-binder_environment.yml b/devel/py-spyder/files/patch-binder_environment.yml
new file mode 100644
index 000000000000..f5f454102ee9
--- /dev/null
+++ b/devel/py-spyder/files/patch-binder_environment.yml
@@ -0,0 +1,11 @@
+--- binder/environment.yml.orig	2022-10-14 18:00:34 UTC
++++ binder/environment.yml
+@@ -33,7 +33,7 @@ dependencies:
+ - python-lsp-server >=1.5.0,<1.6.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
diff --git a/devel/py-spyder/files/patch-requirements_main.yml b/devel/py-spyder/files/patch-requirements_main.yml
new file mode 100644
index 000000000000..cab30c18def6
--- /dev/null
+++ b/devel/py-spyder/files/patch-requirements_main.yml
@@ -0,0 +1,11 @@
+--- requirements/main.yml.orig	2022-10-14 17:58:24 UTC
++++ requirements/main.yml
+@@ -30,7 +30,7 @@ dependencies:
+   - python-lsp-black >=1.2.0
+   - python-lsp-server >=1.5.0,<1.6.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
diff --git a/devel/py-spyder/files/patch-setup.py b/devel/py-spyder/files/patch-setup.py
index 9b345df23cc4..0fcd7d5de7a7 100644
--- a/devel/py-spyder/files/patch-setup.py
+++ b/devel/py-spyder/files/patch-setup.py
@@ -1,11 +1,35 @@
---- setup.py.orig	2018-03-13 19:57:09 UTC
+--- setup.py.orig	2022-08-29 23:48:19 UTC
 +++ setup.py
-@@ -291,7 +291,7 @@ install_requires = [
-     'numpydoc',
-     # Packages for pyqt5 are only available in
-     # Python 3
--    'pyqt5<5.10;python_version>="3"',
-+    #'pyqt5<5.10;python_version>="3"',
-     # This is only needed for our wheels on Linux.
-     # See issue #3332
-     'pyopengl;platform_system=="Linux"'
+@@ -91,7 +91,7 @@ def get_data_files():
+     """
+     Return data_files in a platform dependent manner.
+     """
+-    if sys.platform.startswith('linux'):
++    if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
+         data_files = [('share/applications', ['scripts/spyder.desktop']),
+                       ('share/icons', ['img_src/spyder.png']),
+                       ('share/metainfo',
+@@ -197,7 +197,6 @@ setup_args = dict(
+         'Topic :: Scientific/Engineering',
+         'Topic :: Software Development :: Widget Sets',
+     ],
+-    cmdclass=CMDCLASS,
+ )
+ 
+ 
+@@ -229,12 +228,12 @@ install_requires = [
+     'pyqt5<5.16',
+     'pyqtwebengine<5.16',
+     'python-lsp-server[all]>=1.5.0,<1.6.0',
+-    'pyxdg>=0.26;platform_system=="Linux"',
++    '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',
++    'qtconsole',
+     'qtpy>=2.1.0',
+     'rtree>=0.9.7',
+     'setuptools>=49.6.0',
diff --git a/devel/py-spyder/files/patch-spyder_dependencies.py b/devel/py-spyder/files/patch-spyder_dependencies.py
new file mode 100644
index 000000000000..21723e2a6c1f
--- /dev/null
+++ b/devel/py-spyder/files/patch-spyder_dependencies.py
@@ -0,0 +1,15 @@
+--- spyder/dependencies.py.orig	2022-10-15 07:03:54 UTC
++++ spyder/dependencies.py
+@@ -57,10 +57,10 @@ 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'
+ QTPY_REQVER = '>=2.1.0'
+ RTREE_REQVER = '>=0.9.7'
+ SETUPTOOLS_REQVER = '>=49.6.0'