[125914] trunk/dports/python/py-bokeh

[stromnov at macports.org]

Revision: 125914
          https://trac.macports.org/changeset/125914
Author:   stromnov at macports.org
Date:     2014-09-29 04:50:36 -0700 (Mon, 29 Sep 2014)
Log Message:
-----------
py-bokeh: update to version 0.6.1

Modified Paths:
--------------
    trunk/dports/python/py-bokeh/Portfile
    trunk/dports/python/py-bokeh/files/patch-setup.py.diff

Modified: trunk/dports/python/py-bokeh/Portfile
===================================================================
--- trunk/dports/python/py-bokeh/Portfile	2014-09-29 11:39:35 UTC (rev 125913)
+++ trunk/dports/python/py-bokeh/Portfile	2014-09-29 11:50:36 UTC (rev 125914)
@@ -2,18 +2,16 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           github 1.0
 PortGroup           python 1.0
 
-github.setup        ContinuumIO bokeh 0.5.2
-
 name                py-bokeh
+version             0.6.1
 revision            0
 categories-append   devel
 platforms           darwin
 license             BSD
 
-python.versions     27
+python.versions     27 34
 
 maintainers         stromnov openmaintainer
 
@@ -24,17 +22,18 @@
                     the customized rendering flexibility of Protovis and d3.
 
 homepage            https://github.com/ContinuumIO/Bokeh
+master_sites        https://pypi.python.org/packages/source/b/bokeh/
 
-checksums           rmd160  490a8b0277dddd16e1f8b71569842caa140058d8 \
-                    sha256  027be6b7c321e95da407b7cf40e4b3b3778a659a6899d6d725a542d4f13100c9
+distname            bokeh-${version}
 
+checksums           rmd160  b66e18d0ab71c8c04e4926c9d6f7cb7c43e52a2c \
+                    sha256  b8af9a8c7d94232ff57b74b0af0054d00d56e795bfda312a4b22c41ef1462eb9
+
 if {${name} ne ${subport}} {
     depends_lib-append  port:py${python.version}-flask \
                         port:py${python.version}-jinja2 \
                         port:py${python.version}-markupsafe \
                         port:py${python.version}-werkzeug \
-                        port:py${python.version}-gevent \
-                        port:py${python.version}-gevent-websocket \
                         port:py${python.version}-greenlet \
                         port:py${python.version}-itsdangerous \
                         port:py${python.version}-numpy \
@@ -48,14 +47,23 @@
                         port:py${python.version}-pystache \
                         port:py${python.version}-markdown \
                         port:py${python.version}-yaml \
-                        port:py${python.version}-chaco \
-                        port:py${python.version}-traits
+                        port:py${python.version}-colorama
 
+    if {${python.version} < 30} {
+        depends_lib-append  port:py${python.version}-gevent \
+                            port:py${python.version}-gevent-websocket
+    }
+
     depends_run-append  port:redis
 
     patchfiles-append   patch-setup.py.diff
 
+    destroot.post_args-append \
+                        --install_js
+
     livecheck.type      none
 } else {
-    livecheck.regex     {archive/(\d+(?:\.\d+)*)\.[tz]}
+    livecheck.type      regex
+    livecheck.url       ${master_sites}
+    livecheck.regex     {bokeh-(\d+(?:\.\d+)*)\.[tz]}
 }

Modified: trunk/dports/python/py-bokeh/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-bokeh/files/patch-setup.py.diff	2014-09-29 11:39:35 UTC (rev 125913)
+++ trunk/dports/python/py-bokeh/files/patch-setup.py.diff	2014-09-29 11:50:36 UTC (rev 125914)
@@ -1,25 +1,12 @@
---- setup.py.orig	2014-08-17 23:58:44.000000000 +0400
-+++ setup.py	2014-08-18 00:01:13.000000000 +0400
-@@ -234,22 +234,6 @@
-     site_packages = getsitepackages()[0]
+--- setup.py.orig	2014-09-29 15:30:59.000000000 +0400
++++ setup.py	2014-09-29 15:31:19.000000000 +0400
+@@ -282,9 +282,6 @@
+         sys.argv.remove('--build_js')
  
- bokeh_path = join(site_packages, "bokeh")
--if exists(bokeh_path) and isdir(bokeh_path):
--    prompt = "\nFound existing bokeh install: %s\nRemove it? [y|N] " % bokeh_path
--    if sys.version_info[0] < 3:
--        val = raw_input(prompt)
--    else:
--        val = input(prompt)
--    if val == "y":
--        print ("Removing old bokeh install...")
--        try:
--            shutil.rmtree(bokeh_path)
--            print ("Removed.")
--        except (IOError, OSError):
--            print ("Unable to remove old bokeh at: %s" % bokeh_path)
--            sys.exit(-1)
--    else:
--        print ("Not removing old bokeh install")
+     elif '--install_js' in sys.argv:
+-        if not installing:
+-            print("Error: Option '--install_js' only valid with 'install', 'develop' or 'sdist', exiting.")
+-            sys.exit(1)
+         jsbuild = False
+         sys.argv.remove('--install_js')
  
- path_file = join(site_packages, "bokeh.pth")
- path = abspath(dirname(__file__))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140929/4380274d/attachment-0001.html>