8000 Changes in setupext · matplotlib/matplotlib@3bfd1d0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3bfd1d0

Browse files
Changes in setupext
2 parents 7fd5a02 + 36bc7da commit 3bfd1d0
  • testing
  • tests
  • tri
  • mpl_toolkits
  • requirements/doc
  • src
  • sub-wheels/matplotlib.tests
  • tutorials/colors
  • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    113 files changed

    +2541
    -1530
    lines changed

    .circleci/config.yml

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -27,7 +27,8 @@ apt-run: &apt-install
    2727
    graphviz \
    2828
    fonts-crosextra-carlito \
    2929
    fonts-freefont-otf \
    30-
    fonts-humor-sans
    30+
    fonts-humor-sans \
    31+
    optipng
    3132
    3233
    fonts-run: &fonts-install
    3334
    name: Install custom fonts

    .flake8

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -63,10 +63,8 @@ per-file-ignores =
    6363
    lib/matplotlib/mathtext.py: E221, E251
    6464
    lib/matplotlib/pylab.py: F401, F403
    6565
    lib/matplotlib/pyplot.py: F401, F811
    66-
    lib/matplotlib/rcsetup.py: E501
    6766
    lib/matplotlib/style/__init__.py: F401
    6867
    lib/matplotlib/testing/conftest.py: F401
    69-
    lib/matplotlib/testing/compare.py: F401
    7068
    lib/matplotlib/testing/decorators.py: F401
    7169
    lib/matplotlib/tests/conftest.py: F401
    7270
    lib/matplotlib/tests/test_backend_qt.py: F401

    doc/Makefile

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -24,6 +24,9 @@ clean:
    2424
    rm -rf "$(SOURCEDIR)/savefig"
    2525
    rm -rf "$(SOURCEDIR)/sphinxext/__pycache__"
    2626

    27+
    show:
    28+
    @python -c "import webbrowser; webbrowser.open_new_tab('file://$(shell pwd)/build/html/index.html')"
    29+
    2730
    # Catch-all target: route all unknown targets to Sphinx using the new
    2831
    # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
    2932
    %: Makefile

    doc/_static/mpl.css

    Lines changed: 0 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -189,10 +189,6 @@ div.documentwrapper {
    189189
    }
    190190
    */
    191191

    192-
    div.clearer {
    193-
    clear: both;
    194-
    }
    195-
    196192
    div.related h3 {
    197193
    display: none;
    198194
    }

    doc/_templates/autosummary.rst

    Lines changed: 2 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -21,11 +21,8 @@
    2121
    creates no example file for those (sphinx-gallery/sphinx-gallery#365)
    2222
    2323
    {% else %}
    24-
    .. include:: {{module}}.{{objname}}.examples
    25-
    26-
    .. raw:: html
    27-
    28-
    <div class="clearer"></div>
    24+
    .. minigallery:: {{module}}.{{objname}}
    25+
    :add-heading:
    2926

    3027
    {% endif %}
    3128
    {% endif %}

    doc/_templates/function.rst

    Lines changed: 2 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -5,8 +5,5 @@
    55

    66
    .. autofunction:: {{ objname }}
    77

    8-
    .. include:: {{module}}.{{objname}}.examples
    9-
    10-
    .. raw:: html
    11-
    12-
    <div class="clearer"></div>
    8+
    .. minigallery:: {{module}}.{{objname}}
    9+
    :add-heading:

    doc/api/animation_api.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -135,7 +135,7 @@ Examples
    135135

    136136
    ../gallery/animation/animate_decay
    137137
    ../gallery/animation/bayes_update
    138-
    ../gallery/animation/double_pendulum_sgskip
    138+
    ../gallery/animation/double_pendulum
    139139
    ../gallery/animation/animated_histogram
    140140
    ../gallery/animation/rain
    141141
    ../gallery/animation/random_walk

    doc/api/api_changes_3.3/behaviour.rst

    Lines changed: 10 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -291,5 +291,13 @@ larger GUIs, where Matplotlib may control the toolbar but not the status bar.
    291291
    :rc:`text.hinting` now supports the values "default", "no_autohint",
    292292
    "force_autohint", and "no_hinting", which directly map to the FreeType flags
    293293
    FT_LOAD_DEFAULT, etc. The old synonyms (respectively "either", "native",
    294-
    "auto", and "none") are still supported. To get normalized values, use
    295-
    `.backend_agg.get_hinting_flag`, which returns integer flag values.
    294+
    "auto", and "none") are still supported, but their use is discouraged. To get
    295+
    normalized values, use `.backend_agg.get_hinting_flag`, which returns integer
    296+
    flag values.
    297+
    298+
    `.cbook.get_sample_data` auto-loads numpy arrays
    299+
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    300+
    When `.cbook.get_sample_data` is used to load a npy or npz file and the
    301+
    keyword-only parameter ``np_load`` is True, the file is automatically loaded
    302+
    using `numpy.load`. ``np_load`` defaults to False for backwards compatibility,
    303+
    but will become True in a later release.

    doc/api/api_changes_3.3/deprecations.rst

    Lines changed: 13 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -238,7 +238,8 @@ The following validators, defined in `.rcsetup`, are deprecated:
    238238
    ``validate_axes_titlelocation``, ``validate_toolbar``,
    239239
    ``validate_ps_papersize``, ``validate_legend_loc``,
    240240
    ``validate_bool_maybe_none``, ``validate_hinting``,
    241-
    ``validate_movie_writers``, ``validate_webagg_address``.
    241+
    ``validate_movie_writers``, ``validate_webagg_address``,
    242+
    ``validate_nseq_float``, ``validate_nseq_int``.
    242243
    To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
    243244
    RcParams(); rc[k] = v`` raises an exception.
    244245

    @@ -406,6 +407,16 @@ what the docs stated). They are deprecated; if you write a backend
    406407
    which needs to customize such events, please directly override
    407408
    ``press_pan``/``press_zoom``/``release_pan``/``release_zoom`` instead.
    408409

    410+
    FigureCanvasGTK3._renderer_init
    411+
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    412+
    Overriding this method to initialize renderers for GTK3 canvases is deprecated.
    413+
    Instead, the renderer should be initialized in the ``__init__`` method of the
    414+
    subclass (which should call the base-class' ``__init__`` as appropriate). To
    415+
    keep back-compatibility with earlier versions of Matplotlib (which *required*
    416+
    ``_renderer_init`` to be overridden), a fully empty implementation (``def
    417+
    _renderer_init(self): pass``) may be kept and will not trigger the deprecation
    418+
    warning.
    419+
    409420
    Path helpers in :mod:`.bezier`
    410421
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    411422

    @@ -545,7 +556,7 @@ The ``cbid`` and ``locator`` attribute are deprecated. Use
    545556
    ``qt_compat.is_pyqt5``
    546557
    ~~~~~~~~~~~~~~~~~~~~~~
    547558
    This function is deprecated in prevision of the future release of PyQt6. The
    548-
    Qt version can be checked using ``QtCore.QT_VERSION_STR``.
    559+
    Qt version can be checked using ``QtCore.qVersion()``.
    549560

    550561
    Reordering of parameters by `.Artist.set`
    551562
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    doc/conf.py

    Lines changed: 5 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -111,13 +111,14 @@ def _check_dependencies():
    111111
    missing_references_warn_unused_ignores = False
    112112

    113113
    intersphinx_mapping = {
    114-
    'python': ('https://docs.python.org/3', None),
    114+
    'Pillow': ('https://pillow.readthedocs.io/en/stable/', None),
    115115
    'cycler': ('https://matplotlib.org/cycler', None),
    116116
    'dateutil': ('https://dateutil.readthedocs.io/en/stable/', None),
    117+
    'ipykernel': ('https://ipykernel.readthedocs.io/en/latest/', None),
    117118
    'numpy': ('https://docs.scipy.org/doc/numpy/', None),
    118119
    'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
    119-
    'Pillow': ('https://pillow.readthedocs.io/en/stable/', None),
    120120
    'pytest': ('https://pytest.org/en/stable', None),
    121+
    'python': ('https://docs.python.org/3', None),
    121122
    'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
    122123
    }
    123124

    @@ -138,6 +139,8 @@ def _check_dependencies():
    138139
    'within_subsection_order': gallery_order.subsectionorder,
    139140
    'remove_config_comments': True,
    140141
    'min_reported_time': 1,
    142+
    'compress_images': ('thumbnails', 'images'),
    143+
    'matplotlib_animations': True,
    141144
    }
    142145

    143146
    plot_gallery = 'True'

    doc/devel/coding_guide.rst

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -139,6 +139,9 @@ Milestones
    139139

    140140
    If multiple rules apply, choose the first matching from the above list.
    141141

    142+
    Setting a milestone does not imply or guarantee that a PR will be merged for that
    143+
    release, but if it were to be merged what release it would be in.
    144+
    142145
    All of these PRs should target the master branch. The milestone tag triggers
    143146
    an :ref:`automatic backport <automated-backports>` for milestones which have
    144147
    a corresponding branch.

    doc/devel/documenting_mpl.rst

    Lines changed: 7 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -304,12 +304,12 @@ Including figures and files
    304304
    ---------------------------
    305305

    306306
    Image files can directly included in pages with the ``image::`` directive.
    307-
    e.g., :file:`users/navigation_toolbar.rst` displays the toolbar icons
    308-
    with a call to a static image::
    307+
    e.g., :file:`thirdpartypackages/index.rst` displays the images for the third-party
    308+
    packages as static images::
    309309

    310-
    .. image:: ../_static/toolbar.png
    310+
    .. image:: /_static/toolbar.png
    311311

    312-
    as rendered on the page: :ref:`navigation-toolbar`.
    312+
    as rendered on the page: :ref:`thirdparty-index`.
    313313

    314314
    Files can be included verbatim. For instance the ``matplotlibrc`` file
    315315
    is important for customizing Matplotlib, and is included verbatim in the
    @@ -890,7 +890,9 @@ Miscellaneous
    890890
    Adding animations
    891891
    -----------------
    892892

    893-
    There is a Matplotlib Google/Gmail account with username ``mplgithub``
    893+
    Animations are scraped automatically by Sphinx-gallery. If this is not
    894+
    desired,
    895+
    there is also a Matplotlib Google/Gmail account with username ``mplgithub``
    894896
    which was used to setup the github account but can be used for other
    895897
    purposes, like hosting Google docs or Youtube videos. You can embed a
    896898
    Matplotlib animation in the docs by first saving the animation as a

    doc/matplotlibrc

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -2,3 +2,4 @@ backend : Agg
    22
    figure.figsize : 5.5, 4.5 # figure size in inches
    33
    savefig.dpi : 80 # figure dots per inch
    44
    docstring.hardcopy : True # set this when you want to generate hardcopy docstring
    5+
    animation.embed_limit : 30 # allow embedded animations to be big

    doc/missing-references.json

    Lines changed: 21 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,10 @@
    11
    {
    2+
    "c:var": {
    3+
    "PyOS_InputHook": [
    4+
    "doc/users/interactive_guide.rst:401",
    5+
    "doc/users/interactive_guide.rst:411"
    6+
    ]
    7+
    },
    28
    "py:attr": {
    39
    "ax": [
    410
    "lib/mpl_toolkits/axes_grid1/colorbar.py:docstring of mpl_toolkits.axes_grid1.colorbar.ColorbarBase:23"
    @@ -453,6 +459,9 @@
    453459
    "FigureCanvasQTAgg.print_figure": [
    454460
    "doc/api/prev_api_changes/api_changes_2.2.0.rst:199"
    455461
    ],
    462+
    "IPython.terminal.interactiveshell.TerminalInteractiveShell.inputhook": [
    463+
    "doc/users/interactive_guide.rst:428"
    464+
    ],
    456465
    "_find_tails": [
    457466
    "lib/matplotlib/quiver.py:docstring of matplotlib.quiver.Barbs:9"
    458467
    ],
    @@ -521,6 +530,9 @@
    521530
    ]
    522531
    },
    523532
    "py:mod": {
    533+
    "IPython.terminal.pt_inputhooks": [
    534+
    "doc/users/interactive_guide.rst:428"
    535+
    ],
    524536
    "dateutil": [
    525537
    "lib/matplotlib/dates.py:docstring of matplotlib.dates:1"
    526538
    ],
    @@ -562,6 +574,9 @@
    562574
    "./gallery/index.html": [
    563575
    "doc/devel/contributing.rst:562"
    564576
    ],
    577+
    "Artist.stale_callback": [
    578+
    "doc/users/interactive_guide.rst:326"
    579+
    ],
    565580
    "Artist.sticky_edges": [
    566581
    "doc/api/axes_api.rst:362:<autosummary>:1",
    567582
    "lib/matplotlib/axes/_axes.py:docstring of matplotlib.axes.Axes.use_sticky_edges:2"
    @@ -640,6 +655,9 @@
    640655
    "doc/gallery/misc/ftface_props.rst:16",
    641656
    "lib/matplotlib/font_manager.py:docstring of matplotlib.font_manager.ttfFontProperty:8"
    642657
    ],
    658+
    "Figure.stale_callback": [
    659+
    "doc/users/interactive_guide.rst:336"
    660+
    ],
    643661
    "FigureCanvas": [
    644662
    "lib/matplotlib/backend_tools.py:docstring of matplotlib.backend_tools.ToolBase:25"
    645663
    ],
    @@ -966,6 +984,9 @@
    966984
    "invert_yaxis": [
    967985
    "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_ylim3d:24"
    968986
    ],
    987+
    "ipykernel.pylab.backend_inline": [
    988+
    "doc/users/interactive.rst:249"
    989+
    ],
    969990
    "kde.covariance_factor": [
    970991
    "lib/matplotlib/mlab.py:docstring of matplotlib.mlab.GaussianKDE:41"
    971992
    ],

    0 commit comments

    Comments
     (0)
    0