Merge remote-tracking branch 'upstream/RC_v1.5.x' into typing_feature…

…_detection # Conflicts: # tobac/feature_detection.py
tobac-project · Nov 8, 2023 · 4753c13 · 4753c13
2 parents 4718419 + 85f8f3a
commit 4753c13
Show file tree

Hide file tree

Showing 24 changed files with 74,098 additions and 83,625 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,6 +1,9 @@
 version: 2
 formats: all
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
 python:
-  version: 3
   install:
-    - requirements: doc/requirements.txt
+    - requirements: doc/requirements.txt
diff --git a/doc/bulk_statistics/index.rst b/doc/bulk_statistics/index.rst
@@ -0,0 +1,10 @@
+##########################
+  Compute bulk statistics
+##########################
+
+.. toctree::
+   :maxdepth: 2
+
+   notebooks/compute_statistics_during_feature_detection_example
+   notebooks/compute_statistics_during_segmentation_example
+   notebooks/compute_statistics_postprocessing_example