Skip to content
/ matplotlib Public

  • Sponsor matplotlib/matplotlib

    GitHub Sponsors
    Learn more about Sponsors
    @matplotlib

    matplotlib

    matplotlib

    Sponsor
    External links
    https://numfocus.org/donate-to-matplotlib

    Learn more about funding links in repositories.

    Report abuse

  • Notifications You must be signed in to change notification settings
  • Fork 7.9k
  • Star 21.3k

Backport PR #10451 on branch v2.2.x #10499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2018
+10 −5
Merged

Backport PR #10451 on branch v2.2.x #10499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -91,3 +91,8 @@ cover/
__conda_version__.txt
lib/png.lib
lib/z.lib

# Jupyter files #
#################

.ipynb_checkpoints/
2 changes: 1 addition & 1 deletion doc/api/animation_api.rst
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ Examples
../gallery/animation/animate_decay
../gallery/animation/bayes_update
../gallery/animation/double_pendulum_sgskip
../gallery/animation/histogram
../gallery/animation/animated_histogram
../gallery/animation/rain
../gallery/animation/random_walk
../gallery/animation/simple_anim
2 changes: 1 addition & 1 deletion doc/index.rst
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ interface toolkits.
border="0" alt="screenshots"/>
</div>
<div class="responsive_subfig">
<img align="middle" src="_images/sphx_glr_histogram_thumb1.png"
<img align="middle" src="_images/sphx_glr_histogram_thumb.png"
border="0" alt="screenshots"/>
</div>
<div class="responsive_subfig">
0 examples/animation/histogram.py → examples/animation/animated_histogram.py
View file
File renamed without changes.
0 examples/api/date_index_formatter.py → examples/api/custom_index_formatter.py
View file
File renamed without changes.
0 examples/axes_grid1/scatter_hist.py → ...axes_grid1/scatter_hist_locatable_axes.py
View file
File renamed without changes.
0 examples/color/color_cycle.py → examples/color/color_cycler.py
View file
File renamed without changes.
0 ...lines_bars_and_markers/errorbar_limits.py → ...ars_and_markers/errorbar_limits_simple.py
View file
File renamed without changes.
0 examples/pyplots/boxplot_demo.py → examples/pyplots/boxplot_demo_pyplot.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pytest.ini
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ pep8ignore =
*examples/pyplots/annotation_basic.py E231
*examples/pyplots/annotation_polar.py E231
*examples/pyplots/auto_subplots_adjust.py E231 E261 E302 W391
*examples/pyplots/boxplot_demo.py E231
*examples/pyplots/boxplot_demo_pyplot.py E231
*examples/pyplots/compound_path_demo.py E231
*examples/pyplots/fig_axes_customize_simple.py E261
*examples/pyplots/pyplot_formatstr.py E231
4 changes: 2 additions & 2 deletions tutorials/toolkits/axes_grid.py
View file
Original file line number Diff line number Diff line change
@@ -226,8 +226,8 @@

See the full source code below.

.. figure:: ../../gallery/axes_grid1/images/sphx_glr_scatter_hist_001.png
:target: ../../gallery/axes_grid1/scatter_hist.html
.. figure:: ../../gallery/axes_grid1/images/sphx_glr_scatter_hist_locatable_axes_001.png
:target: ../../gallery/axes_grid1/scatter_hist_locatable_axes.html
:align: center
:scale: 50