Please find below an update to the latest version of spyder. Changelog
can be found at
https://github.com/spyder-ide/spyder/blob/v3.3.6/CHANGELOG.md.
This update relies on newer versions of devel/spyder/py-spyder-kernels
and x11/py-qtawesome. Diffs have been sent to ports@.
I was kind of surprised that the version in ports suggested that 'make
test' should work. This is unlikely as tests rely on several
dependencies, which have not been set in TDEP. Also, a couple of these
dependencies are not in ports. As such, set NO_TEST=Yes.
While here sort order of RUN_DEPENDS.
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index 43890c53a23..c0de4c2a26a 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT = Scientific PYthon Development EnviRonment
-MODPY_EGG_VERSION = 3.3.3
+MODPY_EGG_VERSION = 3.3.6
DISTNAME = spyder-${MODPY_EGG_VERSION}
PKGNAME = spyder${MAJOR_VERSION}-${MODPY_EGG_VERSION}
@@ -19,7 +19,6 @@ PKGNAME = spyder3-${MODPY_EGG_VERSION}
.else
MAJOR_VERSION =
.endif
-REVISION = 1
SUBST_VARS += MAJOR_VERSION
@@ -32,20 +31,21 @@ 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}>=0.5.0,<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} \
- x11/py-qt5${MODPY_FLAVOR}<5.12 \
- x11/py-qtpy${MODPY_FLAVOR}>=1.5.0 \
+ x11/py-qt5${MODPY_FLAVOR}<5.13 \
x11/py-qtawesome${MODPY_FLAVOR}>=0.4.1 \
- devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0
+ x11/py-qtpy${MODPY_FLAVOR}>=1.5.0
-TEST_DEPENDS += ${RUN_DEPENDS}
+# XXX test requires several python modules, which we do not have in ports.
+NO_TEST = Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/spyder/__init__.py
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 = {
