Merge daadb6d into 13e303b

desihub · Nov 5, 2021 · 5c5fdf8 · 5c5fdf8
2 parents 13e303b + daadb6d
commit 5c5fdf8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -17,8 +17,8 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                python-version: [3.7, 3.8]
-                astropy-version: ['4.0.2', '4.2']  #, '<5.0']
+                python-version: [3.7, 3.8, 3.9]
+                astropy-version: ['4.0.2', '4.2', '<5.0']
         env:
             DESIMODEL_DATA: branches/test-0.13
 
@@ -35,7 +35,7 @@ jobs:
               run: |
                 python -m pip install --upgrade pip wheel
                 python -m pip install pytest
-                python -m pip install git+https://github.com/desihub/desiutil.git@3.2.0#egg=desiutil
+                python -m pip install git+https://github.com/desihub/desiutil.git@3.2.3#egg=desiutil
                 python -m pip install git+https://github.com/desihub/desimodel.git@0.13.0#egg=desimodel
                 svn export https://desi.lbl.gov/svn/code/desimodel/${DESIMODEL_DATA}/data
                 python -m pip install git+https://github.com/desihub/specsim.git@v0.14#egg=specsim
@@ -68,7 +68,7 @@ jobs:
               run: |
                 python -m pip install --upgrade pip wheel
                 python -m pip install pytest pytest-cov coveralls
-                python -m pip install git+https://github.com/desihub/desiutil.git@3.2.0#egg=desiutil
+                python -m pip install git+https://github.com/desihub/desiutil.git@3.2.3#egg=desiutil
                 python -m pip install git+https://github.com/desihub/desimodel.git@0.13.0#egg=desimodel
                 svn export https://desi.lbl.gov/svn/code/desimodel/${DESIMODEL_DATA}/data
                 python -m pip install git+https://github.com/desihub/specsim.git@v0.14#egg=specsim
@@ -101,7 +101,6 @@ jobs:
               with:
                 python-version: ${{ matrix.python-version }}
             - name: Install Python dependencies
-              run: python -m pip install --upgrade pip wheel Sphinx
+              run: python -m pip install --upgrade pip wheel docutils\<0.18 Sphinx
             - name: Test the documentation
               run: sphinx-build -W --keep-going -b html doc doc/_build/html
-
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,19 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+    configuration: doc/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+    version: 3
+    install:
+        - requirements: doc/rtd-requirements.txt
diff --git a/doc/rtd-requirements.txt b/doc/rtd-requirements.txt
@@ -0,0 +1 @@
+docutils<0.18