Fixing missing modules, add the script entry point, load the yaml the…

…mes files and fix the conda recipe to call bokeh instead of bokeh-server [ci enable examples]."
bokeh · Oct 29, 2015 · 93b6d82 · 93b6d82
1 parent d29c84f
commit 93b6d82
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
 global-exclude .git*
 include LICENSE.txt
 include versioneer.py
+include bokeh/themes/*.yaml
 recursive-include examples *.py *.ipynb *.md
 prune examples/charts/.ipynb_checkpoints
 prune examples/compat/mpl/.ipynb_checkpoints

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -69,7 +69,7 @@ test:
     - icalendar
 
   commands:
-    - bokeh-server -h        [linux64 or osx]
+    - bokeh -h        [linux64 or osx]
 
   imports:
     - bokeh

diff --git a/setup.py b/setup.py
@@ -86,7 +86,7 @@ def yellow(text) : return text
 
 copy("LICENSE.txt", "bokeh/")
 
-package_data = ['LICENSE.txt']
+package_data = ['LICENSE.txt', 'themes/*.yaml']
 
 def package_path(path, filters=()):
     if not os.path.exists(path):
@@ -530,6 +530,10 @@ def parse_jsargs():
     cmdclass=_cmdclass,
     packages=[
         'bokeh',
+        'bokeh.application',
+        'bokeh.application.tests',
+        'bokeh.application.spellings',
+        'bokeh.application.spellings.tests',
         'bokeh.models',
         'bokeh.models.tests',
         'bokeh.models.widgets',
@@ -541,24 +545,22 @@ def parse_jsargs():
         'bokeh._legacy_charts.builder',
         'bokeh._legacy_charts.builder.tests',
         'bokeh._legacy_charts.tests',
+        'bokeh.client',
+        'bokeh.command',
         'bokeh.compat',
         'bokeh.compat.mplexporter',
         'bokeh.compat.mplexporter.renderers',
         'bokeh.crossfilter',
         'bokeh.sampledata',
         'bokeh.server',
-        'bokeh.server.core',
-        'bokeh.server.core.tests',
         'bokeh.server.protocol',
         'bokeh.server.protocol.messages',
         'bokeh.server.protocol.messages.tests',
         'bokeh.server.protocol.tests',
-        'bokeh.server.storage',
-        'bokeh.server.storage.tests',
         'bokeh.server.tests',
         'bokeh.server.views',
-        'bokeh.server.views.tests',
         'bokeh.sphinxext',
+        'bokeh.themes',
         'bokeh.tests',
         'bokeh.transforms',
         'bokeh.util',
@@ -571,7 +573,7 @@ def parse_jsargs():
     url='http://github.com/bokeh/bokeh',
     description='Statistical and novel interactive HTML plots for Python',
     license='New BSD',
-    #scripts=scripts,
+    scripts=['bin/bokeh'],
     zip_safe=False,
     install_requires=REQUIRES
 )