Re: update spyder to 3.3.6

On Sun 28/03/2021 06:56, rgc wrote:
> ports@
>
> to be considered as part 2/2 for an update of spyder3 to 3.3.6
>
> 3.3.6 is the last version before tons of new modules were added as requirements
> if i get comfortable porting other stuff, i **might** get 4.2.5 in the ports
>
> actual update to spyder 3.3.6

Thanks for your diff! I was wondering why you did not add
www/py-qtwebengine as RDEP? It seems that it is needed [0]. I build
spyder using the diff below and have been running with it for the last
couple of days on amd64. So far, no regression found.

Note that you also need a newer version of py-spyder-kernels. I will
send a diff in a separate mail.

Additionally to the above: did you make progress in updating spyder to
an even newer version?

[0] https://github.com/spyder-ide/spyder/pull/8753/files
[1] https://github.com/spyder-ide/spyder/commit/aca5a34af021b5c86298c900615abbe6484f41f3


diff --git Makefile Makefile
index 6148fa6d5e4..d734837ddc7 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@

COMMENT = Scientific PYthon Development EnviRonment

-MODPY_EGG_VERSION = 3.3.3
-REVISION = 6
+MODPY_EGG_VERSION = 3.3.6
DISTNAME = spyder-${MODPY_EGG_VERSION}
PKGNAME = spyder3-${MODPY_EGG_VERSION}

@@ -29,18 +28,19 @@ RUN_DEPENDS += databases/py-pickleshare${MODPY_FLAVOR} \
devel/py-rope${MODPY_FLAVOR}>=0.10.5 \
devel/pyflakes${MODPY_FLAVOR} \
devel/pylint${MODPY_FLAVOR} \
+ devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0 \
net/py-zmq${MODPY_FLAVOR} \
- shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
security/py-keyring${MODPY_FLAVOR} \
+ shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
sysutils/py-psutil${MODPY_FLAVOR} \
textproc/py-chardet${MODPY_FLAVOR}>=2.0.0 \
textproc/py-numpydoc${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.0 \
textproc/py-sphinx${MODPY_FLAVOR} \
+ www/py-qtwebengine${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR} \
- x11/py-qtpy${MODPY_FLAVOR}>=1.5.0 \
- x11/py-qtawesome${MODPY_FLAVOR}>=0.4.1 \
- devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0
+ x11/py-qtawesome${MODPY_FLAVOR}>=0.5.7 \
+ x11/py-qtpy${MODPY_FLAVOR}>=1.5.0

TEST_DEPENDS += ${RUN_DEPENDS}

diff --git distinfo distinfo
index 09b790daa9d..82c94cd5637 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spyder/spyder-3.3.3.tar.gz) = 7zHeA89vFJB35k7Vc2uHl9vSeOPJJeQ/C/wxu1X25bo=
-SIZE (spyder/spyder-3.3.3.tar.gz) = 2988827
+SHA256 (spyder/spyder-3.3.6.tar.gz) = YZczN+HiEMjvTNhRI8EOyD3xDf+5o828CIrBPGDg+Pw=
+SIZE (spyder/spyder-3.3.6.tar.gz) = 2996872
diff --git patches/patch-setup_py patches/patch-setup_py
index 5c4e85ccc25..deefe5bf7f4 100644
--- patches/patch-setup_py
+++ patches/patch-setup_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2019/02/23 17:57:43 mariani Exp $
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -27,7 +27,7 @@ import subprocess
+@@ -28,7 +28,7 @@ import subprocess
import sys
import shutil

@@ -12,7 +12,7 @@ Index: setup.py
from distutils.command.install_data import install_data


-@@ -82,7 +82,7 @@ def get_subpackages(name):
+@@ -83,7 +83,7 @@ def get_subpackages(name):

def get_data_files():
"""Return data_files in a platform dependent manner"""
@@ -21,7 +21,7 @@ Index: setup.py
if PY3:
data_files = [('share/applications', ['scripts/spyder3.desktop']),
('share/icons', ['img_src/spyder3.png']),
-@@ -132,7 +132,7 @@ CMDCLASS = {'install_data': MyInstallData}
+@@ -133,7 +133,7 @@ CMDCLASS = {'install_data': MyInstallData}
# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
# platforms due to a bug in pip installation process (see Issue 1158)
SCRIPTS = ['%s_win_post_install.py' % NAME]
@@ -30,12 +30,16 @@ Index: setup.py
SCRIPTS.append('spyder3')
else:
SCRIPTS.append('spyder')
-@@ -244,7 +244,7 @@ install_requires = [
+@@ -238,10 +238,10 @@ install_requires = [
'keyring;sys_platform!="linux2"',
# Packages for pyqt5 are only available in
# Python 3
-- 'pyqt5<=5.12;python_version>="3"'
-+ #'pyqt5<=5.12;python_version>="3"'
+- 'pyqt5<5.13;python_version>="3"',
++ #'pyqt5<5.13;python_version>="3"',
+ # pyqt5 5.12 split WebEngine into the
+ # pyqtwebengine module
+- 'pyqtwebengine<5.13;python_version>="3"'
++ #'pyqtwebengine<5.13;python_version>="3"'
]

extras_require = {
diff --git patches/patch-spyder_config_utils_py patches/patch-spyder_config_utils_py
index 71d8642c81d..0e6b48847a3 100644
--- patches/patch-spyder_config_utils_py
+++ patches/patch-spyder_config_utils_py
@@ -3,15 +3,6 @@ $OpenBSD: patch-spyder_config_utils_py,v 1.2 2019/02/23 17:57:43 mariani Exp $
Index: spyder/config/utils.py
--- spyder/config/utils.py.orig
+++ spyder/config/utils.py
-@@ -162,7 +162,7 @@ def get_edit_extensions():
- #==============================================================================
- def is_ubuntu():
- """Detect if we are running in an Ubuntu-based distribution"""
-- if sys.platform.startswith('linux') and osp.isfile('/etc/lsb-release'):
-+ if sys.platform.startswith(('linux','openbsd')) and osp.isfile('/etc/lsb-release'):
- release_info = open('/etc/lsb-release').read()
- if 'Ubuntu' in release_info:
- return True
@@ -174,7 +174,7 @@ def is_ubuntu():

def is_gtk_desktop():