Merge pull request #272 from weikang9009/master

fix docs building
pysal · May 13, 2019 · 6d07d79 · 6d07d79
2 parents 043985b + f72aaf0
commit 6d07d79
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ env:
     - PYSAL_PYPI=false PYSAL_PLUS=true
     - PYSAL_PYPI=false PYSAL_PLUS=false
 
+
 matrix:
   allow_failures:
     - python: 3.6

diff --git a/environment.yml b/environment.yml
@@ -0,0 +1,16 @@
+name: docs
+channels:
+  - conda-forge
+dependencies:
+  - python=3.6
+#  - geopandas
+  - rtree
+#  - sphinx>=1.4.3
+  - sphinxcontrib-bibtex
+  - sphinx_bootstrap_theme
+  - numpydoc
+#  - scipy>=0.11
+#  - numpy>=1.3
+#  - pandas
+  - esda>=2.0.0
+  - matplotlib
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -8,12 +8,15 @@ sphinx:
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
+conda:
+  environment: environment.yml
+
 python:
-  version: 3.7
+  version: 3.6
   install:
-  - requirements: requirements.txt
   - method: pip
     path: .
-    extra_requirements:
-      - tests
-      - docs
+#    extra_requirements:
+#      - tests
+#      - docs
+
diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -2,4 +2,3 @@ sphinx>=1.4.3
 sphinxcontrib-bibtex
 sphinx_bootstrap_theme
 numpydoc
-esda