Revision: 149533 https://trac.macports.org/changeset/149533 Author: eborisch@macports.org Date: 2016-06-24 15:18:36 -0700 (Fri, 24 Jun 2016) Log Message: ----------- py-qtpy: Update to latest py-qtawesome: Update to latest py-spyder-devel: Update to latest. Qt5 only now. Modified Paths: -------------- trunk/dports/python/py-qtawesome/Portfile trunk/dports/python/py-qtpy/Portfile trunk/dports/python/py-spyder-devel/Portfile trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff Modified: trunk/dports/python/py-qtawesome/Portfile =================================================================== --- trunk/dports/python/py-qtawesome/Portfile 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-qtawesome/Portfile 2016-06-24 22:18:36 UTC (rev 149533) @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup github 1.0 -github.setup spyder-ide qtawesome 0.2.0 v +github.setup spyder-ide qtawesome 0.3.3 v name py-qtawesome license MIT @@ -18,8 +18,8 @@ Elusive Icons in PyQt and PySide applications. checksums \ - rmd160 36299eddacf07cd64654f57976c5a61505e56d03 \ - sha256 1af52e9594e7a3bf81f72c5425f25f2beb1ed9aaa88441a09870efbfb3cfe2ac + rmd160 c919e39f866431c93862b82871892b797ecb0632 \ + sha256 e8b31ec91d0b1a5917dec46e15b22d33a4db55e6451fb24be389cf42440fe4e7 python.versions 27 34 35 Modified: trunk/dports/python/py-qtpy/Portfile =================================================================== --- trunk/dports/python/py-qtpy/Portfile 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-qtpy/Portfile 2016-06-24 22:18:36 UTC (rev 149533) @@ -5,7 +5,7 @@ PortGroup python 1.0 PortGroup github 1.0 -github.setup spyder-ide qtpy 1.0b1 +github.setup spyder-ide qtpy 1.0.2 v name py-qtpy categories-append devel @@ -24,8 +24,8 @@ QtGui and QtWidgets). checksums \ - rmd160 4ee64916d40a1ed81c948f64c1e818f4cae90f50 \ - sha256 c96f7e991787a2af1030af5c14b2e1f06017da06ae7d93335ec2f3791026a567 + rmd160 070cd2e7a10a959384718b92208457baa4274529 \ + sha256 88939058068b253b678af047f2a7a9d97492658745f947541dd14a39196a9c03 python.versions 27 34 35 Modified: trunk/dports/python/py-spyder-devel/Portfile =================================================================== --- trunk/dports/python/py-spyder-devel/Portfile 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-spyder-devel/Portfile 2016-06-24 22:18:36 UTC (rev 149533) @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup github 1.0 -github.setup spyder-ide spyder 3.0.0b2 v +github.setup spyder-ide spyder 3.0.0b3 v name py-spyder-devel revision 0 # Preference on mailing list is to use small numbers for epoch. @@ -40,19 +40,14 @@ if {${name} ne ${subport}} { checksums \ - rmd160 e35eed3debe141c610346a5fb2fd0a2e49c2361d \ - sha256 60353e331547f2a1c4bec31df487525e3cac04a4f942f86dc650a32a6d000afa + rmd160 41a58f5e089e2500f444db5767b51697016a7a60 \ + sha256 8baf16080ef286208b3380bd438d33dad5dd345318b5669f58feff65ca82b388 conflicts py${python.version}-spyder # Will *work* with either/both under the hood, but for dependencies, # provide variants to determine what we label depends_lib. - variant qt5 description {Default to Qt5 GUI.} { - depends_lib-delete port:py${python.version}-pyqt4 - depends_lib-append port:py${python.version}-pyqt5 - } - # Set the pylint executable name set LINT_BIN_NAME pylint-${python.branch} set WINPDB_BIN_NAME winpdb-${python.branch} @@ -69,27 +64,19 @@ reinplace "s|@@LINT_BIN_NAME@@|${LINT_BIN_NAME}|g" \ ${worksrcpath}/spyplugins/ui/pylint/widgets/pylintgui.py reinplace "s|\"assistant\"|\"Assistant\"|g" \ - ${worksrcpath}/spyderlib/spyder.py + ${worksrcpath}/spyderlib/app/spyder.py reinplace "s|\"linguist\"|\"Linguist\"|g" \ - ${worksrcpath}/spyderlib/spyder.py + ${worksrcpath}/spyderlib/app/spyder.py reinplace "s|\"designer\"|\"Designer\"|g" \ - ${worksrcpath}/spyderlib/spyder.py + ${worksrcpath}/spyderlib/app/spyder.py reinplace "s|@@PREFIX@@|${prefix}|g" \ - ${worksrcpath}/spyderlib/spyder.py - reinplace "s|Ctrl\+I|Cmd+I|" \ - ${worksrcpath}/spyderlib/plugins/inspector.py + ${worksrcpath}/spyderlib/app/spyder.py reinplace -E "s|IPython\.qt(\.console)?|qtconsole|g" \ ${worksrcpath}/spyderlib/config/ipython.py \ ${worksrcpath}/spyderlib/plugins/ipythonconsole.py \ ${worksrcpath}/spyderlib/widgets/ipython.py - if {[variant_isset qt5]} { - reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \ - ${worksrcpath}/spyderlib/utils/programs.py - reinplace -E "/setdefault/s/pyqt/pyqt5/" spyderlib/qt/__init__.py - } else { - reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \ - ${worksrcpath}/spyderlib/utils/programs.py - } + reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \ + ${worksrcpath}/spyderlib/utils/programs.py } # Bare minimum @@ -100,7 +87,7 @@ port:py${python.version}-qtawesome \ port:py${python.version}-pickleshare \ port:py${python.version}-path \ - port:py${python.version}-pyqt4 + port:py${python.version}-pyqt5 depends_build-append \ port:GraphicsMagick @@ -145,9 +132,7 @@ } variant docs description {Include python and Qt offline documentation.} { - if {[variant_isset qt5]} { - depends_lib-append port:qt5-docs - } + depends_lib-append port:qt5-docs depends_lib-append port:py${python.version}-htmldocs } Modified: trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff =================================================================== --- trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-spyder-devel/files/patch-widgets-pylintgui.py.diff 2016-06-24 22:18:36 UTC (rev 149533) @@ -1,7 +1,7 @@ ---- spyplugins/ui/pylint/widgets/pylintgui.py.orig 2015-06-23 09:49:01.000000000 -0500 -+++ spyplugins/ui/pylint/widgets/pylintgui.py 2015-06-23 09:49:31.000000000 -0500 -@@ -40,14 +40,8 @@ - _ = get_translation("p_pylint", dirname="spyderplugins") +--- spyplugins/ui/pylint/widgets/pylintgui.py.orig 2016-06-07 13:57:54.000000000 -0500 ++++ spyplugins/ui/pylint/widgets/pylintgui.py 2016-06-07 13:59:10.000000000 -0500 +@@ -47,16 +47,9 @@ + _ = gettext.gettext -PYLINT = 'pylint' @@ -11,8 +11,11 @@ - elif programs.find_program('python3-pylint'): - PYLINT = 'python3-pylint' - +- +-locale_codec = QTextCodec.codecForLocale() -PYLINT_PATH = programs.find_program(PYLINT) +PYLINT = '@@LINT_BIN_NAME@@' ++locale_codec = QTextCodec.codecForLocale() +PYLINT_PATH = programs.find_program('@@LINT_BIN_NAME@@') Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff =================================================================== --- trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-spyder-devel/files/spyderlib_spyder.py.diff 2016-06-24 22:18:36 UTC (rev 149533) @@ -1,5 +1,5 @@ ---- spyderlib/spyder.py.orig 2011-09-05 18:29:00.000000000 -0500 -+++ spyderlib/spyder.py 2011-09-08 08:36:55.000000000 -0500 +--- spyderlib/app/spyder.py.orig 2011-09-05 18:29:00.000000000 -0500 ++++ spyderlib/app/spyder.py 2011-09-08 08:36:55.000000000 -0500 @@ -142,7 +142,7 @@ return osp.join(doc_path, python_chm[0]) else: Modified: trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff =================================================================== --- trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff 2016-06-24 20:05:01 UTC (rev 149532) +++ trunk/dports/python/py-spyder-devel/files/spyderlib_start_app.py.diff 2016-06-24 22:18:36 UTC (rev 149533) @@ -1,5 +1,5 @@ ---- spyderlib/start_app.py-orig 2013-10-14 12:43:43.000000000 -0500 -+++ spyderlib/start_app.py 2013-10-14 12:45:50.000000000 -0500 +--- spyderlib/app/start.py-orig 2013-10-14 12:43:43.000000000 -0500 ++++ spyderlib/app/start.py 2013-10-14 12:45:50.000000000 -0500 @@ -7,6 +7,9 @@ import atexit import random