Merge branch 'master' of https://github.com/xordux/matplotlib into navigate_mode_18151

Author: rohit-rawat-amdocs

.github/CODE_OF_CONDUCT.md

@@ -1,2 +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 [email protected], 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).

.github/workflows/cibuildwheel.yml

@@ -42,7 +42,7 @@ jobs:
           CIBW_SKIP: "cp35-* cp36-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install numpy==1.15
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
           MPL_DISABLE_FH4: "yes"
 
       - name: Build wheels for CPython 3.6
@@ -52,7 +52,7 @@ jobs:
           CIBW_BUILD: "cp36-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install numpy==1.15
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
           MPL_DISABLE_FH4: "yes"
         if: >
           startsWith(github.ref, 'refs/heads/v3.3') ||
@@ -63,7 +63,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "pp3?-*"
-          CIBW_BEFORE_BUILD: pip install numpy==1.15
+          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
         if: >
           runner.os != 'Windows' && (
           startsWith(github.ref, 'refs/heads/v3.3') ||

SECURITY.md

@@ -0,0 +1,31 @@
+# Security Policy
+
+## Supported Versions
+
+The following table lists versions and whether they are supported. Security
+vulnerability reports will be accepted and acted upon for all supported
+versions.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.3.x   | :white_check_mark: |
+| 3.2.x   | :white_check_mark: |
+| 3.1.x   | :x:                |
+| 3.0.x   | :x:                |
+| 2.2.x   | :white_check_mark: |
+| < 2.2   | :x:                |
+
+## Reporting a Vulnerability
+
+If you have found a security vulnerability, in order to keep it confidential, 
+please do not report an issue on GitHub.
+
+Please email us details of the vulnerability at [email protected]; 
+include a description and proof-of-concept that is [short and
+self-contained](http://www.sscce.org/).
+
+You should expect a response within a week of your email. Depending on the 
+severity of the issue, this may require some time to draft an immediate bugfix
+release. Less severe issues may be held until the next release.
+
+We do not award bounties for security vulnerabilities. 

doc/_static/mpl.css

@@ -162,11 +162,6 @@ dt:target,
     background-color: #ffffee;
 }
 
-dl.glossary dt {
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
 pre a {
     color: inherit;
     text-decoration: none;
@@ -245,20 +240,6 @@ div.sphinxsidebar {
 /*    margin-left: -100%; */
 }
 
-div.sphinxsidebar h4, div.sphinxsidebar h3 {
-    margin: 1em 0 0.5em 0;
-    font-size: 0.9em;
-    padding: 0.1em 0 0.1em 0.5em;
-    color: white;
-    border: 1px solid #86989B;
-    background-color: #AFC1C4;
-}
-
-div.sphinxsidebar h3 a {
-    /* workaround for table of contents heading, which is a link */
-    color: white !important;
-}
-
 div.sphinxsidebar ul {
     padding-left: 1.5em;
     margin-top: 10px;

doc/api/axis_api.rst

@@ -121,8 +121,10 @@ Data and view intervals
 
    Axis.get_data_interval
    Axis.get_view_interval
+   Axis.get_inverted
    Axis.set_data_interval
    Axis.set_view_interval
+   Axis.set_inverted
 
 Rendering helpers
 -----------------

doc/api/figure_api.rst

@@ -5,26 +5,5 @@
 .. currentmodule:: matplotlib.figure
 
 .. automodule:: matplotlib.figure
-   :no-members:
-   :no-inherited-members:
-
-Classes
--------
-
-.. autosummary::
-   :toctree: _as_gen/
-   :template: autosummary.rst
-   :nosignatures:
-
-   Figure
-   SubplotParams
-
-Functions
----------
-
-.. autosummary::
-   :toctree: _as_gen/
-   :template: autosummary.rst
-   :nosignatures:
-
-   figaspect
+   :members:
+   :inherited-members:

doc/api/index.rst

@@ -119,6 +119,7 @@ Matplotlib consists of the following submodules:
    texmanager_api.rst
    textpath_api.rst
    ticker_api.rst
+   tight_bbox_api.rst
    tight_layout_api.rst
    transformations.rst
    tri_api.rst

doc/api/next_api_changes/behavior/15127-TAC.rst

@@ -0,0 +1,8 @@
+Raise or warn on registering a colormap twice
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When using `matplotlib.cm.register_cmap` to register a user provided
+or third-party colormap it will now raise a `ValueError` if trying to
+over-write one of the built in colormaps and warn if trying to over
+write a user registered colormap.  This may raise for user-registered
+colormaps in the future.

doc/api/next_api_changes/behavior/17791-AL.rst

@@ -0,0 +1,13 @@
+GTK/Tk key name changes
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The handling of non-ASCII keypresses (as reported in the KeyEvent passed to
+``key_press_event``-handlers) in the GTK and Tk backends now correctly reports
+Unicode characters (e.g., €), and better respects NumLock on the numpad.
+
+The following key names have changed; the new names are consistent with those
+reported by the Qt backends:
+
+- The "Break/Pause" key (keysym 0xff13) is now reported as "pause" instead of
+  "break" (this is also consistent with the X key name).
+- The numpad "delete" key is now reported as "delete" instead of "dec".

doc/api/next_api_changes/behavior/18564-AL.rst

@@ -0,0 +1,8 @@
+Axes3D no longer adds itself to figure
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New `.Axes3D` objects previously added themselves to figures when they were
+created, which lead to them being added twice if
+``fig.add_subplot(111, projection='3d')`` was called.  Now ``ax = Axes3d(fig)``
+will need to be explicitly added to the figure with ``fig.add_axes(ax)``, as
+also needs to be done for normal `.axes.Axes`.