Merge 19d2e8f into e81bf7a

holoviz · Nov 29, 2017 · 256ef95 · 256ef95
2 parents e81bf7a + 19d2e8f
commit 256ef95
Show file tree

Hide file tree

Showing 32 changed files with 135 additions and 360 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +0,0 @@
-[submodule "doc/nbpublisher"]
-	path = doc/nbpublisher
-	url = https://github.com/ioam/ioam-builder.git
-	branch = nbpublisher
-[submodule "doc/builder"]
-	path = doc/builder
-	url = https://github.com/ioam/ioam-builder.git
-	branch = docbuilder

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: python
 sudo: false
 
 python:
-  - "2.7"
+#  - "2.7"
   - "3.6"
 
 install:
@@ -29,5 +29,31 @@ install:
 script:
   - nosetests --with-doctest --with-coverage --cover-package=geoviews
   - flake8 --ignore=E,W . --exclude=./doc
+# TODO: temp, need to use stages or something
+  - python -c "import geoviews as gv; gv.sample_data('notebooks/user_guide/sample-data')"
+  - python -c "import geoviews as gv; gv.sample_data('doc/sample-data')"
+  - conda install -c conda-forge sphinx beautifulsoup4 graphviz
+  - pip install nbsite
+  - pip install sphinx_ioam_theme
+  # TODO
+  - rm notebooks/*.ipynb
+  - cd doc
+  - nbsite_nbpagebuild.py ioam geoviews ../notebooks .
+  - sphinx-build -b html . ./_build/html
+  - nbsite_fix_links.py _build/html
+  - nbsite_cleandisthtml.py ./_build/html take_a_chance
+  - cp -r ../notebooks/user_guide/assets _build/html/user_guide/
+  - cp -r ../notebooks/user_guide/sample-data _build/html/user_guide/
+  - touch ./_build/html/.nojekyll
+  - cd ..
+
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN
+  local_dir: ./doc/_build/html
+  on:
+    branch: docs
+
 
 after_success: coveralls
diff --git a/doc/Geometries.rst b/doc/Geometries.rst
diff --git a/doc/Gridded_Datasets_I.rst b/doc/Gridded_Datasets_I.rst
diff --git a/doc/Gridded_Datasets_II.rst b/doc/Gridded_Datasets_II.rst
diff --git a/doc/Makefile b/doc/Makefile
diff --git a/doc/Projections.rst b/doc/Projections.rst
diff --git a/doc/Working_with_Bokeh.rst b/doc/Working_with_Bokeh.rst
diff --git a/doc/_static/favicon.ico b/doc/_static/favicon.ico
diff --git a/doc/_static/geoviews-logo.png b/doc/_static/geoviews-logo.png
diff --git a/doc/_static/logo.png b/doc/_static/logo.png
diff --git a/doc/_templates/footer.html b/doc/_templates/footer.html
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
diff --git a/doc/_templates/page.html b/doc/_templates/page.html
diff --git a/doc/about.rst b/doc/about.rst
@@ -0,0 +1,9 @@
+About Us
+========
+
+GeoViews was developed through a collaboration between `Continuum
+Analytics <https://continuum.io>`_ and the `Met Office
+<http://www.metoffice.gov.uk>`_.  GeoViews is completely `open source
+<https://github.com/ioam/geoviews>`_, available under a BSD license
+freely for both commercial and non-commercial use.
+
diff --git a/doc/builder b/doc/builder