Unpin sphinx, use my pymatgen/workflow_refactoring branch for tests

.travis.yml

@@ -76,7 +76,8 @@ install:
   # Use gmatteo's pymatgen fork
   #- git clone --depth=50 https://github.com/gmatteo/pymatgen.git && cd pymatgen && pip install -r requirements.txt && pip install -r requirements-optional.txt && python setup.py install && cd ../
 
-  - git clone --depth=50 https://github.com/gmatteo/pymatgen.git && cd pymatgen && python setup.py install && cd ../
+    #- git clone --depth=50 https://github.com/gmatteo/pymatgen.git && cd pymatgen && python setup.py install && cd ../
+  - git clone --depth=50 https://github.com/gmatteo/pymatgen.git && cd pymatgen && git checkout workflow_refactoring && python setup.py install && cd ../
 
   # Use pymatgen master
   #- git clone --depth=50 https://github.com/materialsproject/pymatgen.git && cd pymatgen && pip install -r requirements.txt && pip install -r requirements-optional.txt && python setup.py install && cd ../
@@ -91,8 +92,8 @@ before_script:
     # This to run tests requiring a graphical user e.g. mayavi
     # https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
     - "export DISPLAY=:99.0"
-      #- "sh -e /etc/init.d/xvfb start"
-    - sleep 3 # give xvfb some time to start
+    #- "sh -e /etc/init.d/xvfb start"
+    #- sleep 3 # give xvfb some time to start
     # https://github.com/travis-ci/travis-ci/issues/6307
     - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then rvm get head || true; fi 
 

docs/requirements.txt

@@ -1,10 +1,10 @@
 ipython
-sphinx==1.6.5
+sphinx
+#==1.6.5
 sphinxcontrib-napoleon
 sphinxcontrib-programoutput
 sphinx-gallery
 sphinx-argparse
 sphinx_bootstrap_theme
-#nbsphinx
 sphinxcontrib-bibtex
 releases