Merge branch 'master' into v0.12

mwaskom · Aug 4, 2022 · a5af8a2 · a5af8a2
2 parents 537f592 + a259ac5
commit a5af8a2
Show file tree

Hide file tree

Showing 108 changed files with 1,907 additions and 1,681 deletions.
diff --git a/doc/.gitignore b/doc/.gitignore
@@ -3,6 +3,5 @@ _build/
 generated/
 examples/
 example_thumbs/*.png
-introduction.rst
-tutorial/*.rst
-docstrings/*.rst
+docstrings/
+tutorial/
diff --git a/doc/Makefile b/doc/Makefile
@@ -45,23 +45,20 @@ clean:
 	-rm -rf examples/*
 	-rm -rf example_thumbs/*
 	-rm -rf generated/*
-	-rm -rf introduction_files/*
-	-rm introduction.rst
-	-make -C docstrings clean
-	-make -C tutorial clean
+	-make -C _docstrings clean
+	-make -C _tutorial clean
 
 .PHONY: tutorials
 tutorials:
-	make -C tutorial
+	@mkdir -p tutorial
+	@make -C _tutorial
 
 .PHONY: docstrings
 docstrings:
-	make -C docstrings
+	@mkdir -p docstrings
+	@make -C _docstrings
 
-introduction.rst: introduction.ipynb
-	tools/nb_to_doc.py ./introduction.ipynb
-
-notebooks: tutorials docstrings introduction.rst
+notebooks: tutorials docstrings
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

diff --git a/doc/docstrings/FacetGrid.ipynb → doc/_docstrings/FacetGrid.ipynb b/doc/docstrings/FacetGrid.ipynb → doc/_docstrings/FacetGrid.ipynb
@@ -280,9 +280,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -294,7 +294,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/JointGrid.ipynb → doc/_docstrings/JointGrid.ipynb b/doc/docstrings/JointGrid.ipynb → doc/_docstrings/JointGrid.ipynb
@@ -222,9 +222,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -236,7 +236,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/_docstrings/Makefile b/doc/_docstrings/Makefile
@@ -0,0 +1,13 @@
+rst_files := $(patsubst %.ipynb,../docstrings/%.rst,$(wildcard *.ipynb))
+
+docstrings: ${rst_files}
+
+../docstrings/%.rst: %.ipynb
+	../tools/nb_to_doc.py $*.ipynb ../docstrings
+	@cp -r ../docstrings/$*_files ../generated/
+	@if [ -f ../generated/seaborn.$*.rst ]; then \
+	    touch ../generated/seaborn.$*.rst; \
+	 fi
+
+clean:
+	rm -rf ../docstrings
diff --git a/doc/docstrings/PairGrid.ipynb → doc/_docstrings/PairGrid.ipynb b/doc/docstrings/PairGrid.ipynb → doc/_docstrings/PairGrid.ipynb
@@ -249,9 +249,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -263,7 +263,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/axes_style.ipynb → doc/_docstrings/axes_style.ipynb b/doc/docstrings/axes_style.ipynb → doc/_docstrings/axes_style.ipynb
@@ -80,9 +80,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -94,7 +94,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/barplot.ipynb → doc/_docstrings/barplot.ipynb b/doc/docstrings/barplot.ipynb → doc/_docstrings/barplot.ipynb
@@ -117,7 +117,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/boxenplot.ipynb → doc/_docstrings/boxenplot.ipynb b/doc/docstrings/boxenplot.ipynb → doc/_docstrings/boxenplot.ipynb
@@ -122,7 +122,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/boxplot.ipynb → doc/_docstrings/boxplot.ipynb b/doc/docstrings/boxplot.ipynb → doc/_docstrings/boxplot.ipynb
@@ -165,7 +165,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/catplot.ipynb → doc/_docstrings/catplot.ipynb b/doc/docstrings/catplot.ipynb → doc/_docstrings/catplot.ipynb
@@ -182,7 +182,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/color_palette.ipynb → doc/_docstrings/color_palette.ipynb b/doc/docstrings/color_palette.ipynb → doc/_docstrings/color_palette.ipynb
@@ -176,9 +176,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -190,7 +190,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/countplot.ipynb → doc/_docstrings/countplot.ipynb b/doc/docstrings/countplot.ipynb → doc/_docstrings/countplot.ipynb
@@ -91,7 +91,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/displot.ipynb → doc/_docstrings/displot.ipynb b/doc/docstrings/displot.ipynb → doc/_docstrings/displot.ipynb
@@ -217,9 +217,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -231,7 +231,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/ecdfplot.ipynb → doc/_docstrings/ecdfplot.ipynb b/doc/docstrings/ecdfplot.ipynb → doc/_docstrings/ecdfplot.ipynb
@@ -120,9 +120,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -134,7 +134,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/histplot.ipynb → doc/_docstrings/histplot.ipynb b/doc/docstrings/histplot.ipynb → doc/_docstrings/histplot.ipynb
@@ -461,9 +461,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -475,7 +475,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/jointplot.ipynb → doc/_docstrings/jointplot.ipynb b/doc/docstrings/jointplot.ipynb → doc/_docstrings/jointplot.ipynb
@@ -172,9 +172,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -186,7 +186,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/kdeplot.ipynb → doc/_docstrings/kdeplot.ipynb b/doc/docstrings/kdeplot.ipynb → doc/_docstrings/kdeplot.ipynb
@@ -327,9 +327,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -341,7 +341,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/lineplot.ipynb → doc/_docstrings/lineplot.ipynb b/doc/docstrings/lineplot.ipynb → doc/_docstrings/lineplot.ipynb
@@ -153,7 +153,7 @@
    "cell_type": "raw",
    "metadata": {},
    "source": [
-    "Use the `orient` paramter to aggregate and sort along the vertical dimension of the plot:"
+    "Use the `orient` parameter to aggregate and sort along the vertical dimension of the plot:"
    ]
   },
   {
@@ -431,9 +431,9 @@
    "hash": "8bdfc9d9da1e36addfcfc8a3409187c45d33387af0f87d0d91e99e8d6403f1c3"
   },
   "kernelspec": {
-   "display_name": "Python 3.9.9 ('seaborn-py39-latest')",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "python3"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -445,7 +445,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/move_legend.ipynb → doc/_docstrings/move_legend.ipynb b/doc/docstrings/move_legend.ipynb → doc/_docstrings/move_legend.ipynb
@@ -134,9 +134,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -148,7 +148,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

diff --git a/doc/docstrings/pairplot.ipynb → doc/_docstrings/pairplot.ipynb b/doc/docstrings/pairplot.ipynb → doc/_docstrings/pairplot.ipynb
@@ -203,9 +203,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "seaborn-py38-latest",
+   "display_name": "seaborn-py39-latest",
    "language": "python",
-   "name": "seaborn-py38-latest"
+   "name": "seaborn-py39-latest"
   },
   "language_info": {
    "codemirror_mode": {
@@ -217,7 +217,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.9"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,