pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

New pkgsrc: o UPDATE DESCR, HOMEPAGE, MAINTAINER, o REMOVE spyder.desktop Fix pretty printing in the Jupyter notebook and Jupyter qtconsole for Jupyter 4.0.



Module Name:	pkgsrc-wip
Committed By:	K.I.A.Derouiche <kamel.derouiche%gmail.com@localhost>
Pushed By:	jihbed
Date:		Fri Oct 30 16:25:26 2015 +0100
Changeset:	45790f997122ccf8e341b613a3f1b351ee5260a4

Modified Files:
	spyder/DESCR
	spyder/Makefile
	spyder/PLIST
	spyder/distinfo
Added Files:
	spyder/options.mk
	spyder/patches/patch-setup.py
Removed Files:
	spyder/files/spyder.desktop

Log Message:
New pkgsrc:
	o UPDATE DESCR, HOMEPAGE, MAINTAINER,
	o REMOVE spyder.desktop
	Fix pretty printing in the Jupyter notebook and Jupyter qtconsole for Jupyter 4.0.

The deprecated linearization method in the mechanics module no longer fails to execute.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=45790f997122ccf8e341b613a3f1b351ee5260a4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spyder/DESCR                  |  9 +++------
 spyder/Makefile               | 32 ++++++++++++++---------------
 spyder/PLIST                  | 24 ++++++++++++++++------
 spyder/distinfo               |  8 +++++---
 spyder/files/spyder.desktop   |  7 -------
 spyder/options.mk             | 47 +++++++++++++++++++++++++++++++++++++++++++
 spyder/patches/patch-setup.py | 35 ++++++++++++++++++++++++++++++++
 7 files changed, 123 insertions(+), 39 deletions(-)

diffs:
diff --git a/spyder/DESCR b/spyder/DESCR
index 77c9c78..05784fd 100644
--- a/spyder/DESCR
+++ b/spyder/DESCR
@@ -1,6 +1,3 @@
-The spyderlib module provides powerful console and
-editor related widgets to your PyQt4 application. It also includes a
-Scientific Python development environment named 'Spyder', an alternative to
-IDLE with powerful interactive features such as variable explorer (with
-GUI-based editors for dictionaries, lists, NumPy arrays, etc.), object
-inspector, online help, and a lot more
+Spyder (previously known as Pydee) is a powerful interactive development
+environment for the Python language with advanced editing, interactive
+testing, debugging and introspection features
diff --git a/spyder/Makefile b/spyder/Makefile
index 32d629b..20fca48 100644
--- a/spyder/Makefile
+++ b/spyder/Makefile
@@ -1,32 +1,30 @@
-# $NetBSD: Makefile,v 1.17 2015/01/01 17:35:49 jihbed Exp $
+# $NetBSD$
 
-DISTNAME=	spyder-2.3.2
-CATEGORIES=	devel python
-MASTER_SITES=	https://bitbucket.org/spyder-ide/spyderlib/downloads/
+DISTNAME=	spyder-2.3.7
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PYPI:=s/spyder/}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	jihbed.research%gmail.com@localhost
-HOMEPAGE=	https://bitbucket.org/spyder-ide/spyderlib/
-COMMENT=	Scientific PYthon Development EnviRonment
+MAINTAINER=	kamelderouiche%yahoo.com@localhost
+HOMEPAGE=	https://github.com/spyder-ide/spyder/wiki
+COMMENT= 	Scientific PYthon Development EnviRonment, alternative to IDLE
 LICENSE=	mit
 
+DEPENDS+= 	${PYPKGPREFIX}-rope>=0.9.3:../../devel/py-rope
+DEPENDS+= 	${PYPKGPREFIX}-sphinx>=1.2.3:../../textproc/py-sphinx
+
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c
+USE_LANGUAGES=		# none
 
 PYDISTUTILSPKG= yes
-
-INSTALLATION_DIRS= share/applications
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 post-extract:
-	${CP} ${FILESDIR}/spyder.desktop ${WRKSRC}
+	${MV} ${WRKSRC}/scripts/spyder ${WRKSRC}/scripts/spyder${PYVERSSUFFIX}
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/spyder.desktop \
-		${DESTDIR}${PREFIX}/share/applications
+#.include "options.mk"
 
 .include "../../lang/python/extension.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
-DEPENDS+= 	${PYPKGPREFIX}-sphinx>=1.2.1:../../textproc/py-sphinx
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/spyder/PLIST b/spyder/PLIST
index aa9b7d0..8f5ec70 100644
--- a/spyder/PLIST
+++ b/spyder/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2015/01/01 17:35:49 jihbed Exp $
-bin/spyder
+@comment $NetBSD$
+bin/spyder2.7
 bin/spyder_win_post_install.py
 ${PYSITELIB}/spyderlib/__init__.py
 ${PYSITELIB}/spyderlib/__init__.pyc
@@ -188,6 +188,8 @@ ${PYSITELIB}/spyderlib/images/arredit.png
 ${PYSITELIB}/spyderlib/images/arrow.png
 ${PYSITELIB}/spyderlib/images/bold.png
 ${PYSITELIB}/spyderlib/images/browser.png
+${PYSITELIB}/spyderlib/images/chevron-left.png
+${PYSITELIB}/spyderlib/images/chevron-right.png
 ${PYSITELIB}/spyderlib/images/console/clear.png
 ${PYSITELIB}/spyderlib/images/console/cmdprompt_t.png
 ${PYSITELIB}/spyderlib/images/console/console.png
@@ -254,7 +256,6 @@ ${PYSITELIB}/spyderlib/images/editor/unindent.png
 ${PYSITELIB}/spyderlib/images/editor/versplit.png
 ${PYSITELIB}/spyderlib/images/editor/warning.png
 ${PYSITELIB}/spyderlib/images/editor/wng_list.png
-${PYSITELIB}/spyderlib/images/ext_tools.png
 ${PYSITELIB}/spyderlib/images/file/fileclose.png
 ${PYSITELIB}/spyderlib/images/file/filecloseall.png
 ${PYSITELIB}/spyderlib/images/file/fileimport.png
@@ -375,6 +376,7 @@ ${PYSITELIB}/spyderlib/ipythonconfig.pyc
 ${PYSITELIB}/spyderlib/ipythonconfig.pyo
 ${PYSITELIB}/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo
 ${PYSITELIB}/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo
+${PYSITELIB}/spyderlib/mac_stylesheet.qss
 ${PYSITELIB}/spyderlib/otherplugins.py
 ${PYSITELIB}/spyderlib/otherplugins.pyc
 ${PYSITELIB}/spyderlib/otherplugins.pyo
@@ -745,12 +747,18 @@ ${PYSITELIB}/spyderlib/utils/inspector/tutorial.rst
 ${PYSITELIB}/spyderlib/utils/introspection/__init__.py
 ${PYSITELIB}/spyderlib/utils/introspection/__init__.pyc
 ${PYSITELIB}/spyderlib/utils/introspection/__init__.pyo
-${PYSITELIB}/spyderlib/utils/introspection/base.py
-${PYSITELIB}/spyderlib/utils/introspection/base.pyc
-${PYSITELIB}/spyderlib/utils/introspection/base.pyo
+${PYSITELIB}/spyderlib/utils/introspection/fallback_plugin.py
+${PYSITELIB}/spyderlib/utils/introspection/fallback_plugin.pyc
+${PYSITELIB}/spyderlib/utils/introspection/fallback_plugin.pyo
+${PYSITELIB}/spyderlib/utils/introspection/jedi_plugin.py
+${PYSITELIB}/spyderlib/utils/introspection/jedi_plugin.pyc
+${PYSITELIB}/spyderlib/utils/introspection/jedi_plugin.pyo
 ${PYSITELIB}/spyderlib/utils/introspection/module_completion.py
 ${PYSITELIB}/spyderlib/utils/introspection/module_completion.pyc
 ${PYSITELIB}/spyderlib/utils/introspection/module_completion.pyo
+${PYSITELIB}/spyderlib/utils/introspection/plugin_manager.py
+${PYSITELIB}/spyderlib/utils/introspection/plugin_manager.pyc
+${PYSITELIB}/spyderlib/utils/introspection/plugin_manager.pyo
 ${PYSITELIB}/spyderlib/utils/introspection/rope_plugin.py
 ${PYSITELIB}/spyderlib/utils/introspection/rope_plugin.pyc
 ${PYSITELIB}/spyderlib/utils/introspection/rope_plugin.pyo
@@ -826,6 +834,9 @@ ${PYSITELIB}/spyderlib/widgets/externalshell/__init__.pyo
 ${PYSITELIB}/spyderlib/widgets/externalshell/baseshell.py
 ${PYSITELIB}/spyderlib/widgets/externalshell/baseshell.pyc
 ${PYSITELIB}/spyderlib/widgets/externalshell/baseshell.pyo
+${PYSITELIB}/spyderlib/widgets/externalshell/inputhooks.py
+${PYSITELIB}/spyderlib/widgets/externalshell/inputhooks.pyc
+${PYSITELIB}/spyderlib/widgets/externalshell/inputhooks.pyo
 ${PYSITELIB}/spyderlib/widgets/externalshell/introspection.py
 ${PYSITELIB}/spyderlib/widgets/externalshell/introspection.pyc
 ${PYSITELIB}/spyderlib/widgets/externalshell/introspection.pyo
@@ -952,3 +963,4 @@ ${PYSITELIB}/spyderplugins/widgets/pylintgui.py
 ${PYSITELIB}/spyderplugins/widgets/pylintgui.pyc
 ${PYSITELIB}/spyderplugins/widgets/pylintgui.pyo
 share/applications/spyder.desktop
+share/pixmaps/spyder.png
diff --git a/spyder/distinfo b/spyder/distinfo
index 86a2a5c..432916b 100644
--- a/spyder/distinfo
+++ b/spyder/distinfo
@@ -1,5 +1,7 @@
 $NetBSD: distinfo,v 1.9 2015/01/01 17:35:49 jihbed Exp $
 
-SHA1 (spyder-2.3.2.zip) = dad1ed7c944e8f09259b72b752fe36ee9198785b
-RMD160 (spyder-2.3.2.zip) = de233461336dc72421f7c95acb85a24cd68445bf
-Size (spyder-2.3.2.zip) = 3724423 bytes
+SHA1 (spyder-2.3.7.zip) = 747c44e8ee6405c22cbabfd4fe45270fd61e70da
+RMD160 (spyder-2.3.7.zip) = 7b64b3b54af566c15bfa6adf943b0438f985693f
+SHA512 (spyder-2.3.7.zip) = 6e118eeb13103e0d0a871effed9c05b0265161a3979930b9aaa9de0e2ee82ec6e4710c8664fec19231ef992fd21629be538fc79d3e0f019a8b2248044a29383b
+Size (spyder-2.3.7.zip) = 3043384 bytes
+SHA1 (patch-setup.py) = d0183ed674996031c89f5f9972ad934fdac18492
diff --git a/spyder/files/spyder.desktop b/spyder/files/spyder.desktop
deleted file mode 100644
index 71d5a95..0000000
--- a/spyder/files/spyder.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Spyder
-Exec=spyder
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=true
diff --git a/spyder/options.mk b/spyder/options.mk
new file mode 100644
index 0000000..179b0b2
--- /dev/null
+++ b/spyder/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD: options.mk$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.spyder
+PKG_SUPPORTED_OPTIONS=	ipython numpy scipy sympy pandas pylint \
+		 flakes matplotlib psutil pygments pep8
+PKG_SUGGESTED_OPTIONS+=	ipython numpy scipy sympy pandas pylint \
+		 flakes matplotlib pygments
+
+PKG_OPTIONS_OPTIONAL_GROUPS+=	np plint
+PKG_OPTIONS_GROUP.np=		scipy  pandas
+PKG_OPTIONS_GROUP.plint=		pylint pyflakes pep8
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mipython)
+DEPENDS+=	${PYPKGPREFIX}-ipython>=2.0.0:../../devel/py-ipython
+.endif
+
+.if !empty(PKG_OPTIONS:Mnumpy)
+DEPENDS+=	${PYPKGPREFIX}-numpy>=1.9.2:../../math/py-numpy
+
+.if !empty(PKG_OPTIONS:Mscipy)
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+
+.if !empty(PKG_OPTIONS:Mpandas)
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
+.endif
+
+.if !empty(PKG_OPTIONS:Mmatplotlib)
+DEPENDS+=	${PYPKGPREFIX}-matplotlib>=1.3.1:../../graphics/py-matplotlib
+.endif
+
+.if !empty(PKG_OPTIONS:Mpylint)
+DEPENDS+=	${PYPKGPREFIX}-pylint>=1.4.3:../../devel/py-pylint
+.endif
+
+.if !empty(PKG_OPTIONS:Mflakes)
+DEPENDS+=	${PYPKGPREFIX}-flakes>=0.9.2:../../devel/py-flakes
+.endif
+
+.if !empty(PKG_OPTIONS:Mpep8)
+DEPENDS+=	${PYPKGPREFIX}-pep8>=1.6.2:../../devel/py-pep8
+.endif
+
+.if !empty(PKG_OPTIONS:Msympy)
+DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
+.endif
diff --git a/spyder/patches/patch-setup.py b/spyder/patches/patch-setup.py
new file mode 100644
index 0000000..46affbc
--- /dev/null
+++ b/spyder/patches/patch-setup.py
@@ -0,0 +1,35 @@
+$NetBSD$
+
+--- setup.py.orig	2015-10-04 10:35:42.000000000 +0000
++++ setup.py
+@@ -65,7 +65,7 @@ def get_subpackages(name):
+ 
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+-    if sys.platform.startswith('linux'):
++    if sys.platform.startswith('netbsd'):
+         if PY3:
+             data_files = [('share/applications', ['scripts/spyder3.desktop']),
+                           ('share/pixmaps', ['img_src/spyder3.png'])]
+@@ -83,7 +83,7 @@ def get_data_files():
+ class MyInstallData(install_data):
+     def run(self):
+         install_data.run(self)
+-        if sys.platform.startswith('linux'):
++        if sys.platform.startswith('netbsd'):
+             try:
+                 subprocess.call(['update-desktop-database'])
+             except:
+@@ -207,10 +207,10 @@ def get_packages():
+ # 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]
+-if PY3 and sys.platform.startswith('linux'):
++if PY3 and sys.platform.startswith('netbsd'):
+     SCRIPTS.append('spyder3')
+ else:
+-    SCRIPTS.append('spyder')
++    SCRIPTS.append('spyder'+sys.version[0:3])
+ EXTLIST = ['.mo', '.svg', '.png', '.css', '.html', '.js', '.chm', '.ini',
+            '.txt', '.rst', '.qss']
+ if os.name == 'nt':


Home | Main Index | Thread Index | Old Index