From 9ada3fe07911f70877c884cba5bfc1262926249c Mon Sep 17 00:00:00 2001 From: hannah Date: Thu, 28 May 2020 01:49:45 -0400 Subject: [PATCH 1/4] Update documenting_mpl.rst --- doc/devel/documenting_mpl.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index 551b25912d8a..d73a28d7ee24 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -121,8 +121,12 @@ You can use the ``O`` variable to set additional options: Multiple options can be combined using e.g. ``make O='-j4 -Dplot_gallery=0' html``. -On Windows, options needs to be set as environment variables, e.g. ``set O=-W ---keep-going -j4 & make html``. +On Windows, options needs to be set as environment variables, e.g.: + +.. code-block:: bat + + set O=-W --keep-going -j4 + make html .. _writing-rest-pages: From 28c3b4fd3d62ce9dcc2afb85d07067b8852e9de8 Mon Sep 17 00:00:00 2001 From: hannah Date: Thu, 28 May 2020 02:49:14 -0400 Subject: [PATCH 2/4] Update documenting_mpl.rst --- doc/devel/documenting_mpl.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst index d73a28d7ee24..abb1dd63e88c 100644 --- a/doc/devel/documenting_mpl.rst +++ b/doc/devel/documenting_mpl.rst @@ -111,6 +111,12 @@ it, use .. code-block:: sh make SPHINXOPTS= html + +On Windows the arguments must be at the end of the statement: + +.. code-block:: bat + + make html SPHINXOPTS= You can use the ``O`` variable to set additional options: @@ -121,7 +127,7 @@ You can use the ``O`` variable to set additional options: Multiple options can be combined using e.g. ``make O='-j4 -Dplot_gallery=0' html``. -On Windows, options needs to be set as environment variables, e.g.: +On Windows, either use the format shown above or set options as environment variables, e.g.: .. code-block:: bat From 87b304ddc2e0939f62e7dc8b733b89af658f38f9 Mon Sep 17 00:00:00 2001 From: hannah Date: Thu, 24 Sep 2020 23:27:19 -0400 Subject: [PATCH 3/4] Add reporting to github CoC tab This is a really short term fix until #18538 goes in. --- .github/CODE_OF_CONDUCT.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index da6a62e6ebc3..ffb22b84f9d2 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -1,2 +1,5 @@ Matplotlib follows the Python Software Foundation Code of Conduct in everything we do, see https://www.python.org/psf/conduct/. + +Report violations to matplotlib@numfocus.org, which is checked by Hannah Aizenman (@story645) and Thomas Caswell (@tacaswell) +If you feel uncomfortable reporting to that account, use the NumFocus Code of Conduct [Reporting Form](https://numfocus.typeform.com/to/ynjGdT) and they will get in touch with us to resolve it. From eb683abcc10b419edd801cfc70088244b2f32675 Mon Sep 17 00:00:00 2001 From: hannah Date: Thu, 24 Sep 2020 23:28:53 -0400 Subject: [PATCH 4/4] Update CODE_OF_CONDUCT.md --- .github/CODE_OF_CONDUCT.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index ffb22b84f9d2..bb4a6a8a28c7 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -1,5 +1,6 @@ Matplotlib follows the Python Software Foundation Code of Conduct in everything we do, see https://www.python.org/psf/conduct/. -Report violations to matplotlib@numfocus.org, which is checked by Hannah Aizenman (@story645) and Thomas Caswell (@tacaswell) -If you feel uncomfortable reporting to that account, use the NumFocus Code of Conduct [Reporting Form](https://numfocus.typeform.com/to/ynjGdT) and they will get in touch with us to resolve it. +Report violations to matplotlib@numfocus.org, which is checked by Hannah Aizenman (@story645) and Thomas Caswell (@tacaswell). + +You can also use the NumFocus Code of Conduct [Reporting Form](https://numfocus.typeform.com/to/ynjGdT).