Merge branch 'main' into feature/get_extent

scverse · Sep 11, 2023 · fe90509 · fe90509
2 parents ac3886c + 4c6c1e9
commit fe90509
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,3 @@ spatialdata-sandbox
 
 # version file
 _version.py
-
-# prevent submodule notebooks getting out of sync
-docs/tutorials/notebooks
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "docs/tutorials/notebooks"]
-	path = docs/tutorials/notebooks
+[submodule "docs/tutorials/notebooks_repo"]
+	path = docs/tutorials/notebooks_repo
 	url = https://github.com/scverse/spatialdata-notebooks
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -15,5 +15,5 @@ python:
               - docs
 submodules:
     include:
-        - "docs/tutorials/notebooks"
+        - "docs/tutorials/notebooks_repo"
     recursive: true
diff --git a/docs/conf.py b/docs/conf.py
@@ -106,10 +106,10 @@
     "_build",
     "Thumbs.db",
     "**.ipynb_checkpoints",
-    "tutorials/notebooks/index.md",
-    "tutorials/notebooks/README.md",
-    "tutorials/notebooks/references.md",
-    "tutorials/notebooks/notebooks/paper_reproducibility/*",
+    "tutorials/notebooks_repo/index.md",
+    "tutorials/notebooks_repo/README.md",
+    "tutorials/notebooks_repo/references.md",
+    "tutorials/notebooks_repo/notebooks/paper_reproducibility/*",
 ]
 # Ignore warnings.
 nitpicky = False  # TODO: solve upstream.

diff --git a/docs/index.md b/docs/index.md
@@ -27,7 +27,7 @@ Please see our preprint {cite}`Marconato2023.05.05.539647` for citation and to l
     Learn how to install ``spatialdata``.
 
 .. card:: Tutorials
-    :link: tutorials/notebooks/notebooks
+    :link: tutorials/notebooks_repo/notebooks
     :link-type: doc
 
     Learn how to use ``spatialdata`` with hands-on examples.
@@ -39,7 +39,7 @@ Please see our preprint {cite}`Marconato2023.05.05.539647` for citation and to l
     Find a detailed documentation of ``spatialdata``.
 
 .. card:: Datasets
-    :link: tutorials/notebooks/datasets/README
+    :link: tutorials/notebooks_repo/datasets/README
     :link-type: doc
 
     Example datasets from 8 different technologies.
@@ -64,8 +64,8 @@ Please see our preprint {cite}`Marconato2023.05.05.539647` for citation and to l
 
 installation.md
 api.md
-tutorials/notebooks/notebooks.md
-tutorials/notebooks/datasets/README.md
+tutorials/notebooks_repo/notebooks.md
+tutorials/notebooks_repo/datasets/README.md
 design_doc.md
 contributing.md
 changelog.md

diff --git a/docs/tutorials/notebooks b/docs/tutorials/notebooks
diff --git a/docs/tutorials/notebooks_repo b/docs/tutorials/notebooks_repo