Merge remote-tracking branch 'origin/develop' into dev-renaming-classes-and-functions

shaneahmed · shaneahmed · commit 769a4bcc24b0 · 2021-12-20T21:59:21.000Z
# Conflicts:
#	requirements_dev.txt
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -29,4 +29,5 @@ build:
 python:
   version: "3.8"
   install:
-      - requirements: requirements_dev.txt
+      - requirements: requirements.txt
+      - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1,3 @@
+nbsphinx
+sphinx_gallery
+sphinx_toolbox
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -10,7 +10,6 @@ glymur
 imagecodecs
 jupyterlab
 matplotlib
-nbsphinx
 numpy
 opencv-python==4.5.4.60
 openslide-python==1.1.2
@@ -28,8 +27,6 @@ scikit-image==0.18.3
 scikit-learn>=0.23.2
 shapely
 sphinx==4.1.2
-sphinx-gallery
-sphinx-toolbox
 tifffile
 torch==1.9.1
 torchvision==0.10.1
