[112932] trunk/dports/python/py-spyder-devel
eborisch at macports.org
eborisch at macports.org
Mon Nov 4 06:07:40 PST 2013
Revision: 112932
https://trac.macports.org/changeset/112932
Author: eborisch at macports.org
Date: 2013-11-04 06:07:39 -0800 (Mon, 04 Nov 2013)
Log Message:
-----------
py-spyder-devel: Update to 2.3.0beta1
Modified Paths:
--------------
trunk/dports/python/py-spyder-devel/Portfile
trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff
Removed Paths:
-------------
trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_sourcecode_base.py.diff
Modified: trunk/dports/python/py-spyder-devel/Portfile
===================================================================
--- trunk/dports/python/py-spyder-devel/Portfile 2013-11-04 13:15:15 UTC (rev 112931)
+++ trunk/dports/python/py-spyder-devel/Portfile 2013-11-04 14:07:39 UTC (rev 112932)
@@ -3,15 +3,15 @@
PortSystem 1.0
name py-spyder-devel
-version 2.2.0
-revision 1
+version 2.3.0beta1
+revision 0
# Preference on mailing list is to use small numbers for epoch.
# This is already a date code, so sticking with dates.
epoch 20130508
PortGroup python 1.0
-python.versions 26 27
+python.versions 26 27 31 32 33
python.default_version 27
PortGroup qt4 1.0
@@ -41,12 +41,11 @@
#pyNN-scipy doesn't build universal
universal_variant no
-checksums \
- rmd160 367cc156ba883ede164ea86c414c666f629f2ac9 \
- sha256 1d00120fe54e5d139cfe957093c13290778d8dfdff7f978bbf9e64263ff150e9 \
- sha1 946b14d71931218baf10105f820eaeb4d317ab80
+if {${subport} != ${name}} {
+ checksums \
+ rmd160 cfdbf586c5b305b315978d4849023cc434cc3999 \
+ sha256 724bf763c1aab48f2a8d2e7bd8e32d2926155fb7f52bb052b3fcb07719d5c0bc
-if {${subport} != ${name}} {
conflicts py${python.version}-spyder
# Set the pylint executable name
@@ -56,8 +55,7 @@
spyderlib_baseconfig.py.diff \
spyderlib_plugins_editor.py.diff \
spyderlib_spyder.py.diff \
- spyderlib_utils_programs.py.diff \
- spyderlib_widgets_sourcecode_base.py.diff
+ spyderlib_utils_programs.py.diff
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
@@ -82,7 +80,8 @@
# Bare minimum
depends_lib-append \
port:py${python.version}-pyqt4 \
- port:py${python.version}-sphinx
+ port:py${python.version}-sphinx \
+ port:py${python.version}-zmq
variant tiny description {
Remove all optional dependencies for quickest install. Dependencies\
@@ -100,8 +99,11 @@
port:py${python.version}-htmldocs \
port:py${python.version}-pylint \
port:py${python.version}-pep8 \
- port:py${python.version}-pyflakes \
- port:py${python.version}-rope
+ port:py${python.version}-pyflakes
+ if { ${python.version} < 30 } {
+ depends_lib-append \
+ port:py${python.version}-rope
+ }
}
# These add substantially to the install time
@@ -110,16 +112,17 @@
depends_lib-append \
path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \
port:py${python.version}-ipython \
- port:py${python.version}-zmq \
port:py${python.version}-matplotlib \
port:py${python.version}-scipy
}
- variant pil description {
- Support image objects in editor through PIL (many dependencies.)
- } {
- depends_lib-append \
- port:py${python.version}-pil
+ if { ${python.version} < 30 } {
+ variant pil description {
+ Support image objects in editor through PIL (many dependencies.)
+ } {
+ depends_lib-append \
+ port:py${python.version}-pil
+ }
}
post-extract {
Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff
===================================================================
--- trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff 2013-11-04 13:15:15 UTC (rev 112931)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff 2013-11-04 14:07:39 UTC (rev 112932)
@@ -1,13 +1,13 @@
---- spyderlib/baseconfig.py.orig 2012-05-30 08:53:43.000000000 -0500
-+++ spyderlib/baseconfig.py 2012-05-30 08:55:30.000000000 -0500
-@@ -32,7 +32,9 @@
+--- spyderlib/baseconfig.py.orig 2013-10-21 08:43:46.000000000 -0500
++++ spyderlib/baseconfig.py 2013-10-21 08:44:24.000000000 -0500
+@@ -60,7 +60,9 @@
#==============================================================================
- # Configuration paths
- #==============================================================================
--SUBFOLDER = '.spyder%s' % __version__.split('.')[0]
-+SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
-+ sys.version_info[0],
-+ sys.version_info[1])
+ # Spyder settings dir
+ if TEST is None:
+- SUBFOLDER = '.spyder%s' % __version__.split('.')[0]
++ SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
++ sys.version_info[0],
++ sys.version_info[1])
+ else:
+ SUBFOLDER = 'spyder_test'
- def get_conf_path(filename=None):
- """Return absolute path for configuration file with specified filename"""
Deleted: trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_sourcecode_base.py.diff
===================================================================
--- trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_sourcecode_base.py.diff 2013-11-04 13:15:15 UTC (rev 112931)
+++ trunk/dports/python/py-spyder-devel/files/spyderlib_widgets_sourcecode_base.py.diff 2013-11-04 14:07:39 UTC (rev 112932)
@@ -1,12 +0,0 @@
---- spyderlib/widgets/sourcecode/base.py.orig 2013-06-10 14:24:56.000000000 -0500
-+++ spyderlib/widgets/sourcecode/base.py 2013-06-10 14:26:04.000000000 -0500
-@@ -156,7 +156,8 @@
-
- def focusOutEvent(self, event):
- event.ignore()
-- self.hide()
-+ if event.reason() != Qt.ActiveWindowFocusReason:
-+ self.hide()
-
- def item_selected(self, item=None):
- if item is None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131104/aff2d6d6/attachment.html>
More information about the macports-changes
mailing list