Skip to content

Commit

Permalink
Merge pull request #1363 from jasongrout/theme
Browse files Browse the repository at this point in the history
Switch to Jupyter alabaster theme
  • Loading branch information
jasongrout committed May 18, 2017
2 parents 7a2a17c + f949f92 commit 6eee3dd
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 23 deletions.
13 changes: 11 additions & 2 deletions .travis.yml
Expand Up @@ -5,20 +5,29 @@ python:
- 3.3
- 3.4
- 3.5
- 3.6
addons:
apt_packages:
- pandoc
env:
- GROUP=python TRAVIS_NODE_VERSION=5.1
- GROUP=python TRAVIS_NODE_VERSION=6.9
sudo: false
before_install:
- 'if [[ $GROUP == python ]] ; then bash ./scripts/travis_before_install_py.sh ; fi'
- 'if [[ $GROUP == doc ]] ; then bash ./scripts/travis_before_install_py.sh ; fi'
install:
- 'if [[ $GROUP == python ]] ; then bash ./scripts/travis_install_py.sh ; fi'
- 'if [[ $GROUP == doc ]] ; then bash ./scripts/travis_install_py.sh ; fi'
- 'if [[ $GROUP == js ]] ; then bash ./jupyter-js-widgets/scripts/travis_install_js.sh ; fi'
script:
- 'if [[ $GROUP == python ]] ; then bash ./scripts/travis_script_py.sh ; fi'
- 'if [[ $GROUP == doc ]] ; then bash ./scripts/travis_script_doc.sh ; fi'
- 'if [[ $GROUP == js ]] ; then bash ./jupyter-js-widgets/scripts/travis_script_js.sh ; fi'
matrix:
include:
- python: 3.5
- python: 3.6
env: GROUP=js BROWSER=firefox TRAVIS_NODE_VERSION=6.9
- python: 3.6
env: GROUP=doc
after_success:
- coveralls
22 changes: 8 additions & 14 deletions docs/environment.yml
Expand Up @@ -3,19 +3,13 @@ channels:
- conda-forge
- defaults
dependencies:
- sphinx=1.4.8
- python=3.5
- sphinx_rtd_theme
- jinja2
- tornado
- nbformat
- ipywidgets
- notebook>=4.2
- sphinx>=1.4.6
- ipykernel
- jupyter_client
- jupyter_sphinx
- nbsphinx
- python=3
- sphinx
- pip:
- docutils<0.13.1
- jupyter_sphinx
- git+https://github.com/spatialaudio/nbsphinx.git#egg=nbsphinx
- python-dateutil
- recommonmark==0.4.0
- ipywidgets>=7.0.0a2
- jupyter-alabaster-theme
- recommonmark
10 changes: 5 additions & 5 deletions docs/requirements.txt
@@ -1,8 +1,8 @@
ipykernel
ipywidgets>=7.0.0a2
jupyter-alabaster-theme
jupyter_client
sphinx>=1.4.6
sphinx_rtd_theme==0.1.10-alpha
git+https://github.com/spatialaudio/nbsphinx.git#egg=nbsphinx
jupyter_sphinx
nbsphinx>=0.2.13
recommonmark==0.4.0
ipykernel
jupyter_sphinx
sphinx>=1.4.6
4 changes: 3 additions & 1 deletion docs/source/conf.py
Expand Up @@ -5,7 +5,7 @@
import os
import subprocess
import sys
import sphinx_rtd_theme
import jupyter_alabaster_theme
import recommonmark.parser


Expand Down Expand Up @@ -42,6 +42,7 @@ def bash(filename):
'nbsphinx',
'jupyter_sphinx.embed_widgets',
'IPython.sphinxext.ipython_console_highlighting',
'jupyter_alabaster_theme',
]

intersphinx_mapping = {
Expand Down Expand Up @@ -75,6 +76,7 @@ def bash(filename):


# -- html --------------------------
html_theme = 'jupyter_alabaster_theme'

# html_static_path = ['_static']
htmlhelp_basename = 'ipywidgetsdoc'
Expand Down
2 changes: 1 addition & 1 deletion docs/source/dev_docs.md
Expand Up @@ -11,7 +11,7 @@ containing all the necessary packages (except pandoc), use:
conda env create -f docs/environment.yml
source activate ipywidget_docs # Linux and OS X
activate ipywidget_docs # Windows
```
```

If you want to install the necessary packages with `pip` instead, use
(omitting `--user` if working in a virtual environment):
Expand Down
1 change: 1 addition & 0 deletions docs/source/index.rst
Expand Up @@ -17,6 +17,7 @@ Contents
examples/Widget Custom.ipynb
examples/Widget Alignment.ipynb
examples/Widget Low Level.ipynb
examples/Widget Asynchronous.ipynb
embedding.md
contributing.md
changelog.md
Expand Down
2 changes: 2 additions & 0 deletions scripts/travis_before_install_py.sh
@@ -1 +1,3 @@
set -ex

pip install --upgrade setuptools pip
2 changes: 2 additions & 0 deletions scripts/travis_install_py.sh
@@ -1 +1,3 @@
set -ex

pip install file://$PWD#egg=ipywidgets[test] coveralls
9 changes: 9 additions & 0 deletions scripts/travis_script_doc.sh
@@ -0,0 +1,9 @@
set -ex

pwd

# Verify docs build
pushd docs
pip install -r requirements.txt
make html
popd
2 changes: 2 additions & 0 deletions scripts/travis_script_py.sh
@@ -1,3 +1,5 @@
set -ex

mkdir /tmp/ipywidgets
cd /tmp/ipywidgets
nosetests --with-coverage --cover-package=ipywidgets ipywidgets

0 comments on commit 6eee3dd

Please sign in to comment.