Revision: 96057 https://trac.macports.org/changeset/96057 Author: eborisch@macports.org Date: 2012-07-30 06:49:08 -0700 (Mon, 30 Jul 2012) Log Message: ----------- py-spyder: Upgrade to 2.1.11; improve livecheck Modified Paths: -------------- trunk/dports/python/py-spyder/Portfile trunk/dports/python/py-spyder/files/ipython_checks.diff Modified: trunk/dports/python/py-spyder/Portfile =================================================================== --- trunk/dports/python/py-spyder/Portfile 2012-07-30 13:47:44 UTC (rev 96056) +++ trunk/dports/python/py-spyder/Portfile 2012-07-30 13:49:08 UTC (rev 96057) @@ -3,8 +3,7 @@ PortSystem 1.0 name py-spyder -version 2.1.10 -revision 4 +version 2.1.11 epoch 20111202 PortGroup python 1.0 @@ -40,8 +39,8 @@ universal_variant no checksums \ - rmd160 ba8afe0223b41f5560d69b40be36fa8428b03ff8 \ - sha256 4ba120eaae5f5fafe41787c69fb79888e5cda2f9ece73218bb190b30ffb259e1 + rmd160 2726ca15aa956e3f9f92792cc56b2984fa5d2bf2 \ + sha256 b6d98442a8b529e31cd66c47c6634571aeaae40067757e95b2d6ee748fbc5877 if {${subport} != ${name}} { conflicts port:py${python.version}-spyder-beta @@ -115,4 +114,4 @@ livecheck.type regex livecheck.url http://code.google.com/p/spyderlib/ -livecheck.regex spyder-(\[0-9\]+\.\[0-9\]+(\.\[0-9\]+)?) +livecheck.regex spyder-(\[0-9\]+\.\[0-9\]+(\.\[0-9\]+)?)\.zip Modified: trunk/dports/python/py-spyder/files/ipython_checks.diff =================================================================== --- trunk/dports/python/py-spyder/files/ipython_checks.diff 2012-07-30 13:47:44 UTC (rev 96056) +++ trunk/dports/python/py-spyder/files/ipython_checks.diff 2012-07-30 13:49:08 UTC (rev 96057) @@ -1,37 +1,3 @@ ---- ./spyderlib/plugins/externalconsole.py.orig 2012-07-17 15:26:16.000000000 -0500 -+++ ./spyderlib/plugins/externalconsole.py 2012-07-17 15:27:08.000000000 -0500 -@@ -339,9 +339,9 @@ - ipython_group = QGroupBox( - _("IPython interpreter command line options")) - ipython_layout = QVBoxLayout() -- ipython_is_installed = programs.is_module_installed('IPython', '0.1') -+ ipython_is_installed = programs.is_module_installed('IPython', '>=0.1') - if ipython_is_installed: -- if programs.is_module_installed('IPython', '0.12'): -+ if programs.is_module_installed('IPython', '>=0.12'): - ipython_edit_012 = self.create_lineedit("IPython >=v0.12", - 'ipython_kernel_options', alignment=Qt.Horizontal) - ipython_layout.addWidget(ipython_edit_012) ---- ./spyderlib/spyder.py.orig 2012-07-17 15:28:33.000000000 -0500 -+++ ./spyderlib/spyder.py 2012-07-17 15:29:35.000000000 -0500 -@@ -27,7 +27,7 @@ - try: - # Test if IPython v0.11+ is installed - import IPython -- if IPython.__version__.startswith(('0.11', '0.12'))\ -+ if IPython.__version__.startswith(('0.11', '0.12', '0.13'))\ - and os.environ.get('QT_API', 'pyqt') == 'pyqt': - # If PyQt is the selected GUI toolkit (at this stage, only the - # bootstrap script has eventually set this option), -@@ -837,7 +837,7 @@ - self.help_menu_actions.append(web_resources) - - # IPython frontend action -- if is_module_installed('IPython', '0.12'): -+ if is_module_installed('IPython', '>=0.12'): - ipf_action = create_action(self, _("New IPython frontend..."), - icon="ipython.png", - triggered=self.new_ipython_frontend) --- ./spyderlib/widgets/explorer.py.orig 2012-07-17 15:31:38.000000000 -0500 +++ ./spyderlib/widgets/explorer.py 2012-07-17 15:30:25.000000000 -0500 @@ -286,7 +286,7 @@