Remove pinned versions

Signed-off-by: Conor MacBride <conor@macbride.me>
ConorMacBride · Nov 15, 2021 · 762f21c · 762f21c
1 parent 18c8940
commit 762f21c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -14,14 +14,14 @@ formats:
   - pdf
   - htmlzip
 
+# Build from requirements.txt to use https://github.com/astropy/sphinx-automodapi/pull/121
 # Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.8
   install:
     - requirements: docs/requirements.txt
     - method: pip
       path: .
-# Build from requirements.txt to use https://github.com/astropy/sphinx-automodapi/pull/121
-#      extra_requirements:
-#        - docs
+      extra_requirements:
+        - docs
   system_packages: true
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,9 +1,2 @@
-sphinx==3.1.2
-#sphinx-automodapi==0.12
+# delete requirements.txt and update setup.cfg when merged
 -e git+https://github.com/astropy/sphinx-automodapi.git@refs/pull/121/head#egg=sphinx-automodapi
-ipykernel
-nbsphinx==0.8.5
-sphinx-rtd-theme==0.5.0
-sphinx-gallery
-pytest
-setuptools_scm
diff --git a/setup.cfg b/setup.cfg
@@ -45,12 +45,12 @@ tests =
   pytest-mpl
   tox
 docs =
-  # Keep these in sync with docs/requirements.txt
-  sphinx==3.1.2
-  sphinx-automodapi==0.12
+  sphinx
+  # see docs/requirements.txt for sphinx-automodapi
+  # sphinx-automodapi
   ipykernel
-  nbsphinx==0.8.5
-  sphinx-rtd-theme==0.5.0
+  nbsphinx
+  sphinx-rtd-theme
   sphinx-gallery
   pytest
   setuptools_scm

diff --git a/tox.ini b/tox.ini
@@ -32,13 +32,15 @@ changedir = docs
 description = invoke sphinx-build to build the HTML docs
 extras = docs
 commands =
+    pip install -r requirements.txt
     sphinx-build -j auto -b html . _build/html
 
 [testenv:build_docs-dev]
 changedir = docs
 description = invoke sphinx-build to build the HTML docs (using patched sphinx-automodapi)
 deps =
     -rdocs/requirements.txt
+extras = docs
 setenv = READTHEDOCS = True
 commands =
     sphinx-build -j auto -b html . _build/html