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
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/spyder/spyder/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 26 Feb 2021 18:20:32 -0000 1.10
+++ Makefile 27 Mar 2021 09:49:03 -0000
@@ -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}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/spyder/spyder/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 23 Feb 2019 17:57:43 -0000 1.2
+++ distinfo 27 Mar 2021 09:49:03 -0000
@@ -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
Index: patches/patch-setup_py
===================================================================
RCS file: /home/cvs/ports/devel/spyder/spyder/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 23 Feb 2019 17:57:43 -0000 1.2
+++ patches/patch-setup_py 27 Mar 2021 09:49:03 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2019/02/2
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 = {
Index: patches/patch-spyder_config_utils_py
===================================================================
RCS file:
/home/cvs/ports/devel/spyder/spyder/patches/patch-spyder_config_utils_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-spyder_config_utils_py
--- patches/patch-spyder_config_utils_py 23 Feb 2019 17:57:43 -0000
1.2
+++ patches/patch-spyder_config_utils_py 27 Mar 2021 10:34:36 -0000
@@ -3,15 +3,6 @@ $OpenBSD: patch-spyder_config_utils_py,v
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():
