[122256] trunk/dports/python
eborisch at macports.org
eborisch at macports.org
Fri Jul 18 15:31:05 PDT 2014
Revision: 122256
https://trac.macports.org/changeset/122256
Author: eborisch at macports.org
Date: 2014-07-18 15:31:05 -0700 (Fri, 18 Jul 2014)
Log Message:
-----------
py-spyder[-devel]: Update to 2.3.0.
Modified Paths:
--------------
trunk/dports/python/py-spyder/Portfile
trunk/dports/python/py-spyder-devel/Portfile
Added Paths:
-----------
trunk/dports/python/py-spyder/files/no_AA.diff
trunk/dports/python/py-spyder/files/setup.py.diff
trunk/dports/python/py-spyder-devel/files/setup.py.diff
Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile 2014-07-18 22:25:39 UTC (rev 122255)
+++ trunk/dports/python/py-spyder/Portfile 2014-07-18 22:31:05 UTC (rev 122256)
@@ -3,13 +3,15 @@
PortSystem 1.0
name py-spyder
-version 2.2.5
-revision 2
+version 2.3.0
+revision 0
+# Preference on mailing list is to use small numbers for epoch.
+# This is already a date code, so sticking with dates.
epoch 20111202
PortGroup python 1.0
-python.versions 26 27
+python.versions 26 27 33 34
PortGroup qt4 1.0
categories-append devel
@@ -40,10 +42,10 @@
if {${name} ne ${subport}} {
checksums \
- rmd160 6422c9c18a81f5bc67c6e5f21f32e744ab6c1179 \
- sha256 e2ae6155d6f84a9bdee7b3a6eca4b72f3f5e6d775ad23e8d0e82e125342eacaf
+ rmd160 5d69b1565690f3546a6022b16b4febc5257aac2c \
+ sha256 4a64159eda895c4e1fde92a05ebfcc76f98d9d8d39317d2ffe68ed596635e8f6
- conflicts py${python.version}-spyder-devel
+ conflicts py${python.version}-spyder
# Set the pylint executable name
set LINT_BIN_NAME pylint-${python.branch}
@@ -51,9 +53,10 @@
patchfiles patch-widgets-pylintgui.py.diff \
spyderlib_baseconfig.py.diff \
spyderlib_plugins_editor.py.diff \
+ spyderlib_start_app.py.diff \
spyderlib_spyder.py.diff \
- spyderlib_start_app.py.diff \
- spyderlib_utils_programs.py.diff
+ spyderlib_utils_programs.py.diff \
+ setup.py.diff
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
@@ -70,6 +73,8 @@
${worksrcpath}/spyderlib/spyder.py
reinplace "s|@@APPS_DIR@@|${applications_dir}|g" \
${worksrcpath}/spyderlib/utils/programs.py
+ reinplace "s|Ctrl\+I|Cmd+I|" \
+ ${worksrcpath}/spyderlib/plugins/inspector.py
# Windows newlines in the file cause compile() (in 2.6) to choke
reinplace "s|\r||g" \
${worksrcpath}/doc/conf.py
@@ -78,23 +83,27 @@
# Can use either py*-pyqt4 or py*-pyqt4-devel.
# Bare minimum
depends_lib-append \
- path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
-
+ path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
+ port:py${python.version}-sphinx \
+ port:py${python.version}-zmq
+
variant tiny description {
Remove all optional dependencies for quickest install. Dependencies\
- are detected/enabled at runtime and may be installed separately.\
- Using these variants only affects MacPorts' dependency tracking (which\
- will, in turn, force installation if needed.)
+ are detected/enabled at runtime and may be installed separately.
} conflicts small {}
variant small description {
Remove most optional dependencies for quicker install. Dependencies\
- are detected/enabled at runtime and may be installed separately.\
- Using these variants only affects MacPorts' dependency tracking (which\
- will, in turn, force installations if needed.)
-
+ are detected/enabled at runtime and may be installed separately.
} conflicts tiny {}
+ variant no_anti_alias description {Use non-anti-aliased fonts in editor.} {
+ patchfiles-append no_AA.diff
+ }
+
+ variant optimized description {Create .pyo files. Fails on BuildBot.} {
+ }
+
# These add very little to the install time
if {![ variant_isset tiny ]} {
depends_lib-append \
@@ -102,9 +111,7 @@
port:py${python.version}-pylint \
port:py${python.version}-pep8 \
port:py${python.version}-pyflakes \
- port:py${python.version}-rope \
- port:py${python.version}-sphinx \
- port:py${python.version}-sympy
+ port:py${python.version}-rope
}
# These add substantially to the install time
@@ -113,7 +120,6 @@
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
}
@@ -135,14 +141,16 @@
if {${python.version} == ${python.default_version}} {
ln -s ${python.prefix}/bin/spyder ${destroot}${prefix}/bin/
}
-
- set OPTCMD [concat "HOME=${destroot}/tmp/spyder " \
- "PYTHONPATH=${destroot}${python.pkgd} " \
- "./spyder --optimize"]
- file mkdir ${destroot}/tmp/spyder
- system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
- delete ${destroot}/tmp/spyder
+ if {[variant_isset optimized]} {
+ set OPTCMD [concat "HOME=${destroot}/tmp/spyder " \
+ "PYTHONPATH=${destroot}${python.pkgd} " \
+ "./spyder --optimize"]
+
+ file mkdir ${destroot}/tmp/spyder
+ system "cd ${destroot}${python.prefix}/bin && ${OPTCMD}"
+ delete ${destroot}/tmp/spyder
+ }
delete \
${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
delete ${destroot}${python.prefix}/bin/spyder_win_post_install.py
Copied: trunk/dports/python/py-spyder/files/no_AA.diff (from rev 122245, trunk/dports/python/py-spyder-devel/files/no_AA.diff)
===================================================================
--- trunk/dports/python/py-spyder/files/no_AA.diff (rev 0)
+++ trunk/dports/python/py-spyder/files/no_AA.diff 2014-07-18 22:31:05 UTC (rev 122256)
@@ -0,0 +1,13 @@
+--- spyderlib/widgets/sourcecode/syntaxhighlighters.py.orig 2014-05-01 12:42:23.000000000 -0500
++++ spyderlib/widgets/sourcecode/syntaxhighlighters.py 2014-05-01 12:43:40.000000000 -0500
+@@ -265,6 +265,10 @@
+ if bold:
+ format.setFontWeight(QFont.Bold)
+ format.setFontItalic(italic)
++ if not italic and not bold:
++ font = format.font()
++ font.setStyleStrategy(QFont.NoAntialias)
++ format.setFont(font)
+ self.formats[name] = format
+
+ def _check_color_scheme(self, color_scheme):
Added: trunk/dports/python/py-spyder/files/setup.py.diff
===================================================================
--- trunk/dports/python/py-spyder/files/setup.py.diff (rev 0)
+++ trunk/dports/python/py-spyder/files/setup.py.diff 2014-07-18 22:31:05 UTC (rev 122256)
@@ -0,0 +1,12 @@
+--- setup.py.orig 2014-06-05 09:44:07.000000000 -0500
++++ setup.py 2014-06-05 09:44:25.000000000 -0500
+@@ -181,7 +181,7 @@
+ if TARGET_MATCH:
+ TARGET_VERSION = TARGET_MATCH.groups()
+ else:
+- TARGET_VERSION = (str(sys.version_info.major), str(sys.version_info.minor))
++ TARGET_VERSION = (str(sys.version_info[0]), str(sys.version_info[1]))
+
+
+ def get_packages():
+
Modified: trunk/dports/python/py-spyder-devel/Portfile
===================================================================
--- trunk/dports/python/py-spyder-devel/Portfile 2014-07-18 22:25:39 UTC (rev 122255)
+++ trunk/dports/python/py-spyder-devel/Portfile 2014-07-18 22:31:05 UTC (rev 122256)
@@ -3,15 +3,15 @@
PortSystem 1.0
name py-spyder-devel
-version 2.3.0rc
-revision 1
+version 2.3.0
+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
+epoch 20140711
PortGroup python 1.0
-python.versions 26 27 32 33
+python.versions 26 27 33 34
PortGroup qt4 1.0
categories-append devel
@@ -42,8 +42,8 @@
if {${name} ne ${subport}} {
checksums \
- rmd160 51664bcf0293977d5b516929ecb11639adebe4d9 \
- sha256 7e9b067254026af455a577d594734c97cf5e7fe9898544a09dd4c36756c28cb6
+ rmd160 5d69b1565690f3546a6022b16b4febc5257aac2c \
+ sha256 4a64159eda895c4e1fde92a05ebfcc76f98d9d8d39317d2ffe68ed596635e8f6
conflicts py${python.version}-spyder
@@ -55,7 +55,8 @@
spyderlib_plugins_editor.py.diff \
spyderlib_start_app.py.diff \
spyderlib_spyder.py.diff \
- spyderlib_utils_programs.py.diff
+ spyderlib_utils_programs.py.diff \
+ setup.py.diff
post-patch {
reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
@@ -109,11 +110,8 @@
port:py${python.version}-htmldocs \
port:py${python.version}-pylint \
port:py${python.version}-pep8 \
- port:py${python.version}-pyflakes
- if { ${python.version} < 30 } {
- depends_lib-append \
- port:py${python.version}-rope
- }
+ port:py${python.version}-pyflakes \
+ port:py${python.version}-rope
}
# These add substantially to the install time
@@ -126,13 +124,11 @@
port:py${python.version}-scipy
}
- if { ${python.version} < 30 } {
- variant pil description {
+ variant pil description {
Support image objects in editor through PIL or Pillow (many dependencies.)
- } {
- depends_lib-append \
- path:${python.pkgd}/PIL:py${python.version}-Pillow
- }
+ } {
+ depends_lib-append \
+ path:${python.pkgd}/PIL:py${python.version}-Pillow
}
post-extract {
Added: trunk/dports/python/py-spyder-devel/files/setup.py.diff
===================================================================
--- trunk/dports/python/py-spyder-devel/files/setup.py.diff (rev 0)
+++ trunk/dports/python/py-spyder-devel/files/setup.py.diff 2014-07-18 22:31:05 UTC (rev 122256)
@@ -0,0 +1,12 @@
+--- setup.py.orig 2014-06-05 09:44:07.000000000 -0500
++++ setup.py 2014-06-05 09:44:25.000000000 -0500
+@@ -181,7 +181,7 @@
+ if TARGET_MATCH:
+ TARGET_VERSION = TARGET_MATCH.groups()
+ else:
+- TARGET_VERSION = (str(sys.version_info.major), str(sys.version_info.minor))
++ TARGET_VERSION = (str(sys.version_info[0]), str(sys.version_info[1]))
+
+
+ def get_packages():
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140718/e87dcf7b/attachment-0001.html>
More information about the macports-changes
mailing list