summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2019-04-11 23:38:52 +0200
committerPeter Scheibel <scheibel1@llnl.gov>2019-04-11 14:38:52 -0700
commit263d8a818a75ec5de289b25af4adc995728076cd (patch)
tree19b099e733162c47d6bcbb390fb93311ca4cd092
parent177b7f111a68ef179b36a33aefa9dab627878585 (diff)
downloadspack-263d8a818a75ec5de289b25af4adc995728076cd.tar.gz
spack-263d8a818a75ec5de289b25af4adc995728076cd.tar.bz2
spack-263d8a818a75ec5de289b25af4adc995728076cd.tar.xz
spack-263d8a818a75ec5de289b25af4adc995728076cd.zip
Updated Sphinx configuration (#11165)
-rw-r--r--.readthedocs.yml9
-rw-r--r--.travis.yml2
-rw-r--r--lib/spack/docs/requirements.txt6
3 files changed, 13 insertions, 4 deletions
diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 0000000000..d1be95378e
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,9 @@
+version: 2
+
+sphinx:
+ configuration: lib/spack/docs/conf.py
+
+python:
+ version: 3.7
+ install:
+ - requirements: lib/spack/docs/requirements.txt
diff --git a/.travis.yml b/.travis.yml
index d8f955a332..edf18f7311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,7 @@ jobs:
- r-base-core
- r-base-dev
- - python: '3.6'
+ - python: '3.7'
sudo: required
os: linux
language: python
diff --git a/lib/spack/docs/requirements.txt b/lib/spack/docs/requirements.txt
index 592060a89e..ebe7267680 100644
--- a/lib/spack/docs/requirements.txt
+++ b/lib/spack/docs/requirements.txt
@@ -1,6 +1,6 @@
# These dependencies should be installed using pip in order
# to build the documentation.
-sphinx==1.7.0
-sphinxcontrib-programoutput
-sphinx-rtd-theme
+sphinx==2.0.1
+sphinxcontrib-programoutput==0.14
+sphinx-rtd-theme==0.4.3