Removed sphinx-gallery because Qt was conflicting with PySide2

sharppy · Sep 12, 2019 · f340292 · f340292
1 parent 4585a09
commit f340292
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,15 @@ matrix:
   - os: linux
     language: generic
     env: 
-      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="NO"
+      - PYTHON_VERSION="3.6" BUILD_CONDA="YES" NUMPY_VERSION=1.15 DISPLAY_AVAIL="YES"
   - os: osx
     language: generic
     env: 
       - PYTHON_VERSION="3.6" DISPLAY_AVAIL="NO" BUILD_BINARY="YES" NUMPY_VERSION=1.15
   - os: linux
     language: generic
     env:
-      - PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="NO"
+      - PYTHON_VERSION="3.6" BUILD_DOCS="YES" NUMPY_VERSION=1.15 COVERALLS="YES" DISPLAY_AVAIL="YES"
 before_install:
 - source ci/install.sh
 install:

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -8,6 +8,8 @@ cd "$TRAVIS_BUILD_DIR"
 conda install -q -c anaconda sphinx sphinx_rtd_theme 
 conda install -q -c conda-forge sphinx-gallery
 pip install sphinx-prompt
+conda deactivate
+conda activate devel
 
 echo "Adding the SSH key ..."
 cd ci/

diff --git a/environment.yml b/environment.yml
@@ -6,12 +6,13 @@ channels:
 dependencies:
   - python=3
   - numpy=1.15.*
-  - pyside2
+  - pyside2=5.13.*
   - sphinx
   - pytest
   - qtpy
-  - sphinx-gallery
   - sphinx_rtd_theme
+  #- sphinx-gallery
+  #Sphinx-Gallery removed because it requires matplotlib/pyqt and conflicts with pyside2's Qt version
   - requests
   - python-dateutil 
   - pyinstaller