Fix gallery tests to handle allensdk pinning pynwb/hdmf

NeurodataWithoutBorders · Jul 30, 2021 · fe4ce3d · fe4ce3d
1 parent 3d84c51
commit fe4ce3d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -3,4 +3,4 @@ sphinx
 matplotlib
 sphinx_rtd_theme
 sphinx-gallery
-allensdk  # note that as of allensdk 2.10.0, python 3.8 is not supported
+allensdk>=2.11.0  # python 3.8 is not supported in allensdk<2.11
diff --git a/tox.ini b/tox.ini
@@ -107,9 +107,13 @@ install_command =
 deps =
     -rrequirements-dev.txt
     -rrequirements.txt
-    -rrequirements-doc.txt
 
 commands =
+    pip install -r requirements-doc.txt
+    # installing allensdk may downgrade certain requirements so
+    # reinstall the repo with its requirements
+    pip install -r requirements-dev.txt -r requirements.txt
+    pip install -U -e .
     python test.py --example
 
 [testenv:gallery-py37]
@@ -130,30 +134,45 @@ commands = {[testenv:gallery]commands}
 # Test with python 3.9, pinned dev and doc reqs, and upgraded run requirements
 [testenv:gallery-py39-upgrade-dev]
 basepython = python3.9
+
 install_command =
     pip install -U -e . {opts} {packages}
+
 deps =
     -rrequirements-dev.txt
-    -rrequirements-doc.txt
-commands = {[testenv:gallery]commands}
+
+commands =
+    pip install -r requirements-doc.txt
+    # installing allensdk may downgrade certain requirements so
+    # reinstall the repo with its requirements
+    pip install -r requirements-dev.txt -r requirements.txt
+    pip install -U -e .
+    python test.py --example
 
 # Test with python 3.9, pinned dev and doc reqs, and pre-release run requirements
 [testenv:gallery-py39-upgrade-dev-pre]
 basepython = python3.9
+
 install_command =
     pip install -U --pre -e . {opts} {packages}
+
 deps =
     -rrequirements-dev.txt
-    -rrequirements-doc.txt
-commands = {[testenv:gallery]commands}
+
+commands =
+    pip install -r requirements-doc.txt
+    # installing allensdk may downgrade certain requirements so
+    # reinstall the repo with its requirements
+    pip install -r requirements-dev.txt -r requirements.txt
+    pip install -U --pre -e .
+    python test.py --example
 
 # Test with python 3.7, pinned dev reqs, and minimum run requirements
 [testenv:gallery-py37-min-req]
 basepython = python3.7
 deps =
     -rrequirements-dev.txt
     -rrequirements-min.txt
-    -rrequirements-doc.txt
 commands = {[testenv:gallery]commands}
 
 [testenv:validation-py39]