[Python-modules-commits] [matplotlib] 01/12: Import matplotlib_2.0.2.orig.tar.gz
Sandro Tosi
morph at moszumanska.debian.org
Sun May 28 02:29:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository matplotlib.
commit 4816639bd3468d3e9f9cc9fed76324fdc8e0c9b6
Author: Sandro Tosi <morph at debian.org>
Date: Sun May 14 22:57:13 2017 -0400
Import matplotlib_2.0.2.orig.tar.gz
---
.travis.yml | 4 +-
INSTALL | 12 +-
README.rst | 26 +-
doc/README.txt | 17 +-
doc/_static/depsy_badge_default.svg | 1 +
doc/_static/mpl.css | 4 +-
doc/_templates/badgesidebar.html | 2 +-
doc/_templates/citing.html | 2 +
doc/_templates/layout.html | 3 +-
doc/api/api_changes.rst | 63 ++
doc/api/api_changes/2016-12-09-AL_afm.rst | 7 -
doc/api/artist_api.rst | 1 +
doc/api/container_api.rst | 11 +
doc/api/index.rst | 1 +
doc/conf.py | 18 +
doc/contents.rst | 2 +
doc/devel/README.txt | 9 +
doc/devel/coding_guide.rst | 3 -
doc/devel/documenting_mpl.rst | 13 +-
doc/devel/gitwash/branch_dropdown.png | Bin 0 -> 16311 bytes
doc/devel/gitwash/configure_git.rst | 70 +-
doc/devel/gitwash/development_workflow.rst | 541 ++++++-----
doc/devel/gitwash/following_latest.rst | 6 +-
doc/devel/gitwash/forking_hell.rst | 28 +-
doc/devel/gitwash/git_development.rst | 16 +
doc/devel/gitwash/git_install.rst | 10 +-
doc/devel/gitwash/git_intro.rst | 14 +-
doc/devel/gitwash/git_links.inc | 54 +-
doc/devel/gitwash/git_resources.rst | 17 +-
doc/devel/gitwash/index.rst | 11 +-
doc/devel/gitwash/known_projects.inc | 28 +-
doc/devel/gitwash/maintainer_workflow.rst | 98 ++
doc/devel/gitwash/patching.rst | 51 +-
doc/devel/gitwash/pull_button.png | Bin 0 -> 12893 bytes
doc/devel/gitwash/set_up_fork.rst | 46 +-
doc/devel/gitwash/setting_up_for_development.rst | 16 -
doc/devel/gitwash/this_project.inc | 8 +-
doc/devel/testing.rst | 2 +-
doc/faq/osx_framework.rst | 9 +
doc/faq/troubleshooting_faq.rst | 2 +-
doc/make.py | 29 +
doc/resources/index.rst | 4 +
doc/users/artists.rst | 16 +-
doc/users/customizing.rst | 4 +-
doc/users/dflt_style_changes.rst | 29 +-
doc/users/github_stats.rst | 591 ++++++++++-
doc/users/gridspec.rst | 71 +-
doc/users/image_tutorial.rst | 2 +-
doc/users/plotting/colormaps/colormaps.py | 40 +-
doc/users/plotting/colormaps/grayscale.py | 30 +-
doc/users/plotting/colormaps/lightness.py | 151 ++-
doc/users/pyplot_tutorial.rst | 2 +-
doc/users/whats_new.rst | 14 +
examples/color/color_cycle_default.py | 6 +-
examples/color/color_cycle_demo.py | 16 +-
examples/color/colormaps_reference.py | 52 +-
examples/color/named_colors.py | 27 +-
.../interpolation_none_vs_nearest.py | 62 --
examples/lines_bars_and_markers/barh_demo.py | 6 +-
examples/lines_bars_and_markers/fill_demo.py | 6 +-
.../lines_bars_and_markers/fill_demo_features.py | 4 +-
.../line_demo_dash_control.py | 4 +-
.../line_styles_reference.py | 4 +
examples/lines_bars_and_markers/linestyles.py | 6 +-
.../marker_fillstyle_reference.py | 4 +
.../lines_bars_and_markers/marker_reference.py | 4 +
examples/misc/multiprocess.py | 6 +-
examples/mplot3d/2dcollections3d_demo.py | 10 +-
examples/mplot3d/bars3d_demo.py | 9 +
examples/mplot3d/hist3d_demo.py | 8 +-
examples/mplot3d/pathpatch3d_demo.py | 8 +
examples/mplot3d/polys3d_demo.py | 10 +
examples/pie_and_polar_charts/pie_demo_features.py | 4 +
examples/pie_and_polar_charts/polar_bar_demo.py | 5 +
.../pie_and_polar_charts/polar_scatter_demo.py | 8 +-
examples/pylab_examples/demo_bboximage.py | 8 +-
examples/pylab_examples/matshow.py | 9 +-
examples/pylab_examples/quiver_demo.py | 86 +-
examples/pylab_examples/quiver_simple_demo.py | 18 +
examples/pylab_examples/set_and_get.py | 2 +-
examples/showcase/firefox.py | 8 +
examples/showcase/xkcd.py | 7 +
examples/style_sheets/plot_bmh.py | 30 +-
examples/style_sheets/plot_dark_background.py | 18 +-
examples/style_sheets/plot_fivethirtyeight.py | 26 +-
examples/style_sheets/plot_ggplot.py | 4 +
examples/style_sheets/plot_grayscale.py | 5 +
examples/tests/backend_driver.py | 2 +-
.../text_labels_and_annotations/autowrap_demo.py | 10 +-
.../text_demo_fontdict.py | 8 +-
examples/ticks_and_spines/spines_demo.py | 26 +-
examples/ticks_and_spines/spines_demo_dropped.py | 4 +
examples/ticks_and_spines/tick-formatters.py | 6 +-
examples/ticks_and_spines/tick-locators.py | 6 +-
.../ticks_and_spines/tick_labels_from_values.py | 7 +-
.../ticks_and_spines/ticklabels_demo_rotation.py | 4 +
examples/units/annotate_with_units.py | 9 +
examples/units/artist_tests.py | 22 +-
examples/units/bar_demo2.py | 40 +-
examples/units/bar_unit_demo.py | 14 +-
examples/units/evans_test.py | 10 +-
examples/units/radian_demo.py | 7 +-
examples/units/units_sample.py | 15 +-
examples/units/units_scatter.py | 4 +-
examples/user_interfaces/svg_tooltip.py | 80 +-
extern/agg24-svn/include/agg_rendering_buffer.h | 10 +-
lib/matplotlib/__init__.py | 48 +-
lib/matplotlib/_cm.py | 30 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/afm.py | 10 +-
lib/matplotlib/animation.py | 72 +-
lib/matplotlib/axes/_axes.py | 175 ++--
lib/matplotlib/axes/_base.py | 36 +-
lib/matplotlib/axis.py | 10 +-
lib/matplotlib/backend_bases.py | 12 +-
lib/matplotlib/backends/backend_pdf.py | 14 +-
lib/matplotlib/backends/backend_pgf.py | 7 +-
lib/matplotlib/backends/backend_qt5.py | 54 +-
lib/matplotlib/backends/backend_wx.py | 35 +-
lib/matplotlib/backends/qt_compat.py | 12 +-
lib/matplotlib/cbook.py | 26 +-
lib/matplotlib/cm.py | 33 +-
lib/matplotlib/collections.py | 12 +
lib/matplotlib/colors.py | 12 +-
lib/matplotlib/dates.py | 3 +
lib/matplotlib/figure.py | 31 +-
lib/matplotlib/font_manager.py | 4 +-
lib/matplotlib/image.py | 69 +-
lib/matplotlib/legend_handler.py | 10 +-
lib/matplotlib/lines.py | 6 +-
lib/matplotlib/markers.py | 10 +-
lib/matplotlib/mathtext.py | 19 +-
lib/matplotlib/mlab.py | 2 +-
.../{classic.mplstyle => _classic_test.mplstyle} | 0
lib/matplotlib/mpl-data/stylelib/classic.mplstyle | 2 +
lib/matplotlib/patches.py | 208 ++--
lib/matplotlib/path.py | 26 +-
lib/matplotlib/pyplot.py | 11 +-
lib/matplotlib/quiver.py | 148 +--
lib/matplotlib/rcsetup.py | 25 +-
lib/matplotlib/scale.py | 2 +-
lib/matplotlib/stackplot.py | 5 +-
lib/matplotlib/style/core.py | 9 +-
lib/matplotlib/testing/decorators.py | 51 +-
.../test_arrow_patches/fancyarrow_dash.png | Bin 13085 -> 12574 bytes
.../test_artist/clip_path_clipping.pdf | Bin 4402 -> 4404 bytes
.../test_artist/clip_path_clipping.png | Bin 57839 -> 63545 bytes
.../test_artist/clip_path_clipping.svg | 136 +--
.../tests/baseline_images/test_artist/hatching.pdf | Bin 2201 -> 2626 bytes
.../tests/baseline_images/test_artist/hatching.png | Bin 12203 -> 12143 bytes
.../tests/baseline_images/test_artist/hatching.svg | 78 +-
.../baseline_images/test_axes/arrow_simple.png | Bin 0 -> 15087 bytes
...bar_tick_label_multiple_old_label_alignment.png | Bin 0 -> 8084 bytes
.../test_axes/boxplot_rc_parameters.pdf | Bin 3225 -> 3218 bytes
.../test_axes/boxplot_rc_parameters.png | Bin 7979 -> 7709 bytes
.../test_axes/boxplot_rc_parameters.svg | 300 +++---
.../baseline_images/test_axes/bxp_custombox.png | Bin 2585 -> 2676 bytes
.../baseline_images/test_axes/bxp_customcap.png | Bin 2101 -> 2055 bytes
.../baseline_images/test_axes/bxp_custommedian.png | Bin 2009 -> 1997 bytes
.../test_axes/bxp_custompatchartist.png | Bin 11810 -> 13464 bytes
.../test_axes/bxp_withmean_line.png | Bin 2137 -> 2158 bytes
.../test_image/imshow_masked_interpolation.pdf | Bin 0 -> 27055 bytes
.../test_image/imshow_masked_interpolation.png | Bin 0 -> 19273 bytes
.../test_image/imshow_masked_interpolation.svg | 185 ++++
.../test_image/mask_image_over_under.png | Bin 27283 -> 27319 bytes
.../tests/baseline_images/test_legend/hatching.pdf | Bin 0 -> 11426 bytes
.../tests/baseline_images/test_legend/hatching.png | Bin 0 -> 39539 bytes
.../tests/baseline_images/test_legend/hatching.svg | 1022 ++++++++++++++++++++
.../baseline_images/test_lines/scaled_lines.pdf | Bin 10384 -> 10397 bytes
.../baseline_images/test_lines/scaled_lines.png | Bin 26768 -> 28101 bytes
.../baseline_images/test_lines/scaled_lines.svg | 154 +--
.../test_mathtext/mathtext_cm_81.pdf | Bin 0 -> 7171 bytes
.../test_mathtext/mathtext_cm_81.png | Bin 0 -> 1541 bytes
.../test_mathtext/mathtext_cm_81.svg | 222 +++++
.../test_mathtext/mathtext_dejavusans_81.pdf | Bin 0 -> 6308 bytes
.../test_mathtext/mathtext_dejavusans_81.png | Bin 0 -> 1857 bytes
.../test_mathtext/mathtext_dejavusans_81.svg | 136 +++
.../test_mathtext/mathtext_dejavuserif_81.pdf | Bin 0 -> 6209 bytes
.../test_mathtext/mathtext_dejavuserif_81.png | Bin 0 -> 1860 bytes
.../test_mathtext/mathtext_dejavuserif_81.svg | 141 +++
.../test_mathtext/mathtext_stix_81.pdf | Bin 0 -> 6514 bytes
.../test_mathtext/mathtext_stix_81.png | Bin 0 -> 1677 bytes
.../test_mathtext/mathtext_stix_81.svg | 159 +++
.../test_mathtext/mathtext_stixsans_81.pdf | Bin 0 -> 6361 bytes
.../test_mathtext/mathtext_stixsans_81.png | Bin 0 -> 1641 bytes
.../test_mathtext/mathtext_stixsans_81.svg | 117 +++
.../test_patches/multi_color_hatch.pdf | Bin 0 -> 6190 bytes
.../test_patches/multi_color_hatch.png | Bin 0 -> 11521 bytes
.../test_patches/multi_color_hatch.svg | 469 +++++++++
.../tests/baseline_images/test_path/nan_path.eps | 455 +++++++++
.../tests/baseline_images/test_path/nan_path.pdf | 85 ++
.../tests/baseline_images/test_path/nan_path.png | Bin 0 -> 7789 bytes
.../tests/baseline_images/test_path/nan_path.svg | 222 +++++
.../test_path/semi_log_with_zero.png | Bin 28932 -> 29487 bytes
.../test_patheffects/collection.pdf | Bin 131008 -> 131166 bytes
.../test_patheffects/collection.png | Bin 321483 -> 321288 bytes
.../test_patheffects/collection.svg | 878 ++++++++++++-----
.../test_patheffects/patheffect1.pdf | Bin 11282 -> 11297 bytes
.../test_patheffects/patheffect1.png | Bin 32063 -> 32053 bytes
.../test_patheffects/patheffect1.svg | 98 +-
.../test_patheffects/patheffect2.pdf | Bin 15419 -> 15442 bytes
.../test_patheffects/patheffect2.png | Bin 25161 -> 25172 bytes
.../test_patheffects/patheffect2.svg | 158 +--
.../test_patheffects/patheffect3.pdf | Bin 27584 -> 27653 bytes
.../test_patheffects/patheffect3.png | Bin 81383 -> 81410 bytes
.../test_patheffects/patheffect3.svg | 162 ++--
.../test_patheffects/stroked_text.png | Bin 0 -> 150781 bytes
.../baseline_images/test_text/font_scaling.pdf | Bin 0 -> 382245 bytes
.../test_tightlayout/tight_layout9.pdf | Bin 0 -> 6066 bytes
.../test_tightlayout/tight_layout9.png | Bin 0 -> 18802 bytes
.../test_tightlayout/tight_layout9.svg | 1017 +++++++++++++++++++
.../test_widgets/check_radio_buttons.png | Bin 0 -> 21123 bytes
lib/matplotlib/tests/test_afm.py | 16 +
lib/matplotlib/tests/test_animation.py | 11 +-
lib/matplotlib/tests/test_axes.py | 117 ++-
lib/matplotlib/tests/test_backend_pgf.py | 6 -
lib/matplotlib/tests/test_cbook.py | 5 +
lib/matplotlib/tests/test_coding_standards.py | 1 -
lib/matplotlib/tests/test_colors.py | 4 +
lib/matplotlib/tests/test_cycles.py | 2 +-
lib/matplotlib/tests/test_dates.py | 2 +-
lib/matplotlib/tests/test_figure.py | 12 +
lib/matplotlib/tests/test_font_manager.py | 12 +-
lib/matplotlib/tests/test_image.py | 76 +-
lib/matplotlib/tests/test_legend.py | 31 +
lib/matplotlib/tests/test_marker.py | 19 +
lib/matplotlib/tests/test_mathtext.py | 1 +
lib/matplotlib/tests/test_patches.py | 26 +
lib/matplotlib/tests/test_path.py | 13 +
lib/matplotlib/tests/test_patheffects.py | 28 +
lib/matplotlib/tests/test_scale.py | 8 +
lib/matplotlib/tests/test_style.py | 16 +-
lib/matplotlib/tests/test_text.py | 13 +
lib/matplotlib/tests/test_ticker.py | 36 +-
lib/matplotlib/tests/test_tightlayout.py | 10 +
lib/matplotlib/tests/test_widgets.py | 14 +-
lib/matplotlib/ticker.py | 34 +-
lib/matplotlib/tight_layout.py | 6 +-
lib/matplotlib/widgets.py | 17 +-
lib/mpl_toolkits/axes_grid1/axes_rgb.py | 21 +-
matplotlibrc.template | 8 +-
setup.cfg.template | 2 +-
src/ft2font.cpp | 6 +-
src/path_converters.h | 23 +
244 files changed, 8730 insertions(+), 2286 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e2bf8ca..9c068a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,12 +52,11 @@ matrix:
- python: 3.4
- python: 3.5
env: PANDAS=pandas DELETE_FONT_CACHE=1
+ - python: 3.6
- python: 2.7
env: TEST_ARGS=--pep8
- python: 2.7
env: BUILD_DOCS=true MOCK=mock
- - python: "3.6-dev"
- env: PRE=--pre
- python: "nightly"
env: PRE=--pre
allow_failures:
@@ -76,6 +75,7 @@ before_install:
install:
- ccache -s
+ - git describe
# Upgrade pip and setuptools. Mock has issues with the default version of
# setuptools
- |
diff --git a/INSTALL b/INSTALL
index 74dd8f6..706df37 100644
--- a/INSTALL
+++ b/INSTALL
@@ -64,12 +64,12 @@ install matplotlib using pip_::
python -m pip install matplotlib
In case Python 2.7 or 3.4 are not installed for all users,
-the Microsoft Visual C++ 2008 (
-`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
+the Microsoft Visual C++ 2008
+(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
or
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
-for Python 2.7) or Microsoft Visual C++ 2010 (
-`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
+for Python 2.7) or Microsoft Visual C++ 2010
+(`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
or
`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
for Python 3.4) redistributable packages need to be installed.
@@ -133,13 +133,15 @@ latest git version :ref:`install-from-git`.
The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected.
This means you can set them if your toolchain is prefixed. This may be used for
cross compiling.
+::
export CC=x86_64-pc-linux-gnu-gcc
export CXX=x86_64-pc-linux-gnu-g++
export PKG_CONFIG=x86_64-pc-linux-gnu-pkg-config
Once you have satisfied the requirements detailed below (mainly
-python, numpy, libpng and freetype), you can build matplotlib::
+python, numpy, libpng and freetype), you can build matplotlib.
+::
cd matplotlib
python setup.py build
diff --git a/README.rst b/README.rst
index 8d98da8..4aabced 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,25 @@
+|Travis|_ |AppVeyor|_ |Codecov|_ |PyPi|_ |Gitter|_ |Depsy|_
+
+
+.. |Travis| image:: https://travis-ci.org/matplotlib/matplotlib.svg?branch=master
+.. _Travis: https://travis-ci.org/matplotlib/matplotlib
+
+.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/github/matplotlib/matplotlib?branch=master&svg=true
+.. _AppVeyor: https://ci.appveyor.com/project/matplotlib/matplotlib
+
+.. |Codecov| image:: https://codecov.io/github/matplotlib/matplotlib/badge.svg?branch=master&service=github
+.. _Codecov: https://codecov.io/github/matplotlib/matplotlib?branch=master
+
+.. |PyPi| image:: https://badge.fury.io/py/matplotlib.svg
+.. _PyPi: https://badge.fury.io/py/matplotlib
+
+.. |Gitter| image:: https://badges.gitter.im/Join%20Chat.svg
+ :alt: Join the chat at https://gitter.im/matplotlib/matplotlib
+.. _Gitter: https://gitter.im/matplotlib/matplotlib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+.. |Depsy| image:: http://depsy.org/api/package/pypi/matplotlib/badge.svg
+.. _Depsy: http://depsy.org/package/python/matplotlib
+
##########
matplotlib
##########
@@ -44,9 +66,7 @@ matplotlib's communication channels include active mailing lists:
The first is a good starting point for general questions and discussions.
-.. image:: https://badges.gitter.im/Join%20Chat.svg
- :alt: Join the chat at https://gitter.im/matplotlib/matplotlib
- :target: https://gitter.im/matplotlib/matplotlib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
Contribute
==========
diff --git a/doc/README.txt b/doc/README.txt
index b7c66c8..d88e0b2 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -5,15 +5,24 @@ Matplotlib documentation
Building the documentation
--------------------------
-A list of dependencies can be found in ../doc-requirements.txt.
+To build the documentation, you will need additional dependencies:
-All of these dependencies can be installed through pip::
+* Sphinx-1.3 or later (version 1.5.0 is not supported)
+* numpydoc 0.4 or later
+* IPython
+* mock
+* colorspacious
+* pillow
+* graphviz
+
+All of these dependencies *except graphviz* can be installed through pip::
pip install -r ../doc-requirements.txt
-or conda::
+or all of them via conda and pip::
- conda install sphinx numpydoc ipython mock colorspacious pillow
+ conda install sphinx numpydoc ipython mock graphviz pillow
+ pip install colorspacious
To build the HTML documentation, type ``python make.py html`` in this
directory. The top file of the results will be ./build/html/index.html
diff --git a/doc/_static/depsy_badge_default.svg b/doc/_static/depsy_badge_default.svg
new file mode 100644
index 0000000..2fa22b8
--- /dev/null
+++ b/doc/_static/depsy_badge_default.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h45v20H0z"/><path fill="#4c1" d="M45 0h101v20H45z"/><path fill="url(#b)" d="M0 0h146v20H0z"/></g><g fill="#fff" [...]
\ No newline at end of file
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
index bf571bc..9adea61 100644
--- a/doc/_static/mpl.css
+++ b/doc/_static/mpl.css
@@ -13,8 +13,9 @@ body {
padding: 0;
border: 1px solid #aaa;
color: #333;
- margin: 0px 80px 0px 80px;
+ margin: auto;
min-width: 740px;
+ max-width: 1200px;
}
a {
@@ -42,6 +43,7 @@ pre {
border: 1px solid #ccc;
background-color: #f8f8f8;
line-height: 140%;
+ overflow-x: auto;
}
td.linenos pre {
diff --git a/doc/_templates/badgesidebar.html b/doc/_templates/badgesidebar.html
index 7db65ed..76bc078 100644
--- a/doc/_templates/badgesidebar.html
+++ b/doc/_templates/badgesidebar.html
@@ -1,6 +1,6 @@
<a href="http://depsy.org/package/python/matplotlib">
- <img src="http://depsy.org/api/package/pypi/matplotlib/badge.svg">
+ <img src="{{ pathto('_static/depsy_badge.svg', 1) }}">
</a>
<br/>
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
index 51f08bc..da1177f 100644
--- a/doc/_templates/citing.html
+++ b/doc/_templates/citing.html
@@ -29,6 +29,8 @@ BibTeX entry:
<h2>DOIs</h2>
<dl>
+ <dt>v2.0.1</dt> <dd><a href="https://doi.org/10.5281/zenodo.570311"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.570311.svg" alt="DOI"></a></dd>
+ <dt>v2.0.0</dt><dd><a href="https://doi.org/10.5281/zenodo.248351"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.248351.svg" alt="DOI"></a></dd>
<dt>v1.5.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.61948"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.61948.svg" alt="10.5281/zenodo.61948"></a></dd>
<dt>v1.5.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.56926"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.56926.svg" alt="10.5281/zenodo.56926"></a></dd>
<dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index ad1c55a..aa1f278 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -82,7 +82,8 @@ alt="Logo"/>
VERSION: '{{ release|e }}',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
- HAS_SOURCE: {{ has_source|lower }}
+ HAS_SOURCE: {{ has_source|lower }},
+ SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
};
</script>
{%- for scriptfile in script_files %}
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
index 50fd30a..8a0328a 100644
--- a/doc/api/api_changes.rst
+++ b/doc/api/api_changes.rst
@@ -10,6 +10,69 @@ out what caused the breakage and how to fix it by updating your code.
For new features that were added to Matplotlib, please see
:ref:`whats-new`.
+API Changes in 2.0.1
+====================
+
+Extensions to `matplotlib.backend_bases.GraphicsContextBase`
+------------------------------------------------------------
+
+To better support controlling the color of hatches, the method
+`matplotlib.backend_bases.GraphicsContextBase.set_hatch_color` was
+added to the expected API of ``GraphicsContext`` classes. Calls to
+this method are currently wrapped with a ``try:...except Attribute:``
+block to preserve back-compatibility with any third-party backends
+which do not extend `~matplotlib.backend_bases.GraphicsContextBase`.
+
+This value can be accessed in the backends via
+`matplotlib.backend_bases.GraphicsContextBase.get_hatch_color` (which
+was added in 2.0 see :ref:`gc_get_hatch_color_wn`) and should be used
+to color the hatches.
+
+In the future there may also be ``hatch_linewidth`` and
+``hatch_density`` related methods added. It is encouraged, but not
+required that third-party backends extend
+`~matplotlib.backend_bases.GraphicsContextBase` to make adapting to
+these changes easier.
+
+
+`afm.get_fontconfig_fonts` returns a list of paths and does not check for existence
+-----------------------------------------------------------------------------------
+
+`afm.get_fontconfig_fonts` used to return a set of paths encoded as a
+``{key: 1, ...}`` dict, and checked for the existence of the paths. It now
+returns a list and dropped the existence check, as the same check is performed
+by the caller (`afm.findSystemFonts`) as well.
+
+
+`bar` now returns rectangles of negative height or width if the corresponding input is negative
+-----------------------------------------------------------------------------------------------
+
+`plt.bar` used to normalize the coordinates of the rectangles that it created,
+to keep their height and width positives, even if the corresponding input was
+negative. This normalization has been removed to permit a simpler computation
+of the correct `sticky_edges` to use.
+
+
+Do not clip line width when scaling dashes
+------------------------------------------
+
+The algorithm to scale dashes was changed to no longer clip the
+scaling factor: the dash patterns now continue to shrink at thin line widths.
+If the line width is smaller than the effective pixel size, this may result in
+dashed lines turning into solid gray-ish lines. This also required slightly
+tweaking the default patterns for '--', ':', and '.-' so that with the default
+line width the final patterns would not change.
+
+There is no way to restore the old behavior.
+
+
+Deprecate 'Vega' color maps
+---------------------------
+
+The "Vega" colormaps are deprecated in Matplotlib 2.0.1 and will be
+removed in Matplotlib 2.2. Use the "tab" colormaps instead: "tab10",
+"tab20", "tab20b", "tab20c".
+
API Changes in 2.0.0
====================
diff --git a/doc/api/api_changes/2016-12-09-AL_afm.rst b/doc/api/api_changes/2016-12-09-AL_afm.rst
deleted file mode 100644
index 0df780a..0000000
--- a/doc/api/api_changes/2016-12-09-AL_afm.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-`afm.get_fontconfig_fonts` returns a list of paths and does not check for existence
-```````````````````````````````````````````````````````````````````````````````````
-
-`afm.get_fontconfig_fonts` used to return a set of paths encoded as a
-``{key: 1, ...}`` dict, and checked for the existence of the paths. It now
-returns a list and dropped the existence check, as the same check is performed
-by the caller (`afm.findSystemFonts`) as well.
diff --git a/doc/api/artist_api.rst b/doc/api/artist_api.rst
index 3e1bb8f..da1839b 100644
--- a/doc/api/artist_api.rst
+++ b/doc/api/artist_api.rst
@@ -16,6 +16,7 @@
``Artist`` class
================
+.. autoclass:: Artist
Interactive
-----------
diff --git a/doc/api/container_api.rst b/doc/api/container_api.rst
new file mode 100644
index 0000000..3b765f1
--- /dev/null
+++ b/doc/api/container_api.rst
@@ -0,0 +1,11 @@
+*********
+container
+*********
+
+:mod:`matplotlib.container`
+===========================
+
+.. automodule:: matplotlib.container
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/api/index.rst b/doc/api/index.rst
index 7fb728f..5fb6ed8 100644
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -26,6 +26,7 @@
collections_api.rst
colorbar_api.rst
colors_api.rst
+ container_api.rst
dates_api.rst
dviread.rst
figure_api.rst
diff --git a/doc/conf.py b/doc/conf.py
index 7cfb4d2..ff91f4b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -14,6 +14,7 @@
import os
import sys
import sphinx
+import six
# If your extensions are in another directory, add it here. If the directory
# is relative to the documentation root, use os.path.abspath to make it
@@ -68,6 +69,23 @@ except ImportError:
"mock to build the documentation")
try:
+ from PIL import Image
+except ImportError:
+ raise ImportError("No module named Image - you need to install "
+ "pillow to build the documentation")
+
+if six.PY2:
+ from distutils.spawn import find_executable
+ has_dot = find_executable('dot') is not None
+else:
+ from shutil import which # Python >= 3.3
+ has_dot = which('dot') is not None
+if not has_dot:
+ raise OSError(
+ "No binary named dot - you need to install the Graph Visualization "
+ "software (usually packaged as 'graphviz') to build the documentation")
+
+try:
import matplotlib
except ImportError:
msg = "Error: Matplotlib must be installed before building the documentation"
diff --git a/doc/contents.rst b/doc/contents.rst
index 829073d..945742e 100644
--- a/doc/contents.rst
+++ b/doc/contents.rst
@@ -8,6 +8,8 @@ Overview
:Release: |version|
:Date: |today|
+ Download `PDF <Matplotlib.pdf>`_
+
.. toctree::
:maxdepth: 2
diff --git a/doc/devel/README.txt b/doc/devel/README.txt
new file mode 100644
index 0000000..3fc0740
--- /dev/null
+++ b/doc/devel/README.txt
@@ -0,0 +1,9 @@
+All documentation in the gitwash directory are automatically generated by running the gitwash_dumper.py
+script in the project's root directory using the following parameters:
+
+python gitwash_dumper.py doc/devel Matplotlib --repo-name=matplotlib --github-user=matplotlib \
+ --project-url=http://matplotlib.org \
+ --project-ml-url=https://mail.python.org/mailman/listinfo/matplotlib-devel
+
+The script is hosted at https://raw.githubusercontent.com/matthew-brett/gitwash/master/gitwash_dumper.py.
+For more information please visit https://github.com/matthew-brett/gitwash
\ No newline at end of file
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
index dbf6856..96ec2c6 100644
--- a/doc/devel/coding_guide.rst
+++ b/doc/devel/coding_guide.rst
@@ -35,9 +35,6 @@ Documentation
* See :ref:`documenting-matplotlib` for our documentation style guide.
-* If your changes are non-trivial, please make an entry in the
- :file:`CHANGELOG`.
-
* If your change is a major new feature, add an entry to
:file:`doc/users/whats_new.rst`.
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
index c2cd95a..050e31d 100644
--- a/doc/devel/documenting_mpl.rst
+++ b/doc/devel/documenting_mpl.rst
@@ -8,8 +8,17 @@ Getting started
===============
The documentation for matplotlib is generated from ReStructured Text using the
-Sphinx_ documentation generation tool. Sphinx-1.0 or later and numpydoc 0.4 or
-later is required.
+Sphinx_ documentation generation tool.
+The requirements are as follows (https://github.com/matplotlib/matplotlib/blob/master/doc-requirements.txt)
+
+1. Sphinx-1.3 or later(Version 1.5.0 is not supported)
+2. numpydoc 0.4 or later
+3. IPython
+4. Mock
+5. colorspacious
+6. pillow
+7. graphviz
+
The documentation sources are found in the :file:`doc/` directory in
the trunk. To build the users guide in html format, cd into
diff --git a/doc/devel/gitwash/branch_dropdown.png b/doc/devel/gitwash/branch_dropdown.png
new file mode 100644
index 0000000..1bb7a57
Binary files /dev/null and b/doc/devel/gitwash/branch_dropdown.png differ
diff --git a/doc/devel/gitwash/configure_git.rst b/doc/devel/gitwash/configure_git.rst
index 70c6a5a..3a172d5 100644
--- a/doc/devel/gitwash/configure_git.rst
+++ b/doc/devel/gitwash/configure_git.rst
@@ -1,3 +1,5 @@
+.. highlight:: bash
+
.. _configure-git:
===============
@@ -9,9 +11,12 @@
Overview
========
-Your personal git_ configurations are saved in the ``.gitconfig`` file in
+Your personal git configurations are saved in the ``.gitconfig`` file in
your home directory.
-Here is an example ``.gitconfig`` file::
+
+Here is an example ``.gitconfig`` file:
+
+.. code-block:: none
[user]
name = Your Name
@@ -20,8 +25,8 @@ Here is an example ``.gitconfig`` file::
[alias]
ci = commit -a
co = checkout
- st = status -a
- stat = status -a
+ st = status
+ stat = status
br = branch
wdiff = diff --color-words
@@ -31,13 +36,6 @@ Here is an example ``.gitconfig`` file::
[merge]
summary = true
- [apply]
- whitespace = fix
-
- [core]
- autocrlf = input
-
-
You can edit this file directly or you can use the ``git config --global``
command::
@@ -69,7 +67,9 @@ line::
git config --global user.email you at yourdomain.example.com
This will write the settings into your git configuration file, which
-should now contain a user section with your name and email::
+should now contain a user section with your name and email:
+
+.. code-block:: none
[user]
name = Your Name
@@ -97,7 +97,9 @@ The following ``git config --global`` commands::
git config --global alias.wdiff "diff --color-words"
will create an ``alias`` section in your ``.gitconfig`` file with contents
-like this::
+like this:
+
+.. code-block:: none
[alias]
ci = commit -a
@@ -117,7 +119,9 @@ You may also want to make sure that your editor of choice is used ::
Merging
-------
-To enforce summaries when doing merges (``~/.gitconfig`` file again)::
+To enforce summaries when doing merges (``~/.gitconfig`` file again):
+
+.. code-block:: none
[merge]
log = true
@@ -126,5 +130,43 @@ Or from the command line::
git config --global merge.log true
+.. _fancy-log:
+
+Fancy log output
+----------------
+
+This is a very nice alias to get a fancy log output; it should go in the
+``alias`` section of your ``.gitconfig`` file:
+
+.. code-block:: none
+
+ lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)[%an]%Creset' --abbrev-commit --date=relative
+
+You use the alias with::
+
+ git lg
+
+and it gives graph / text output something like this (but with color!):
+
+.. code-block:: none
+
+ * 6d8e1ee - (HEAD, origin/my-fancy-feature, my-fancy-feature) NF - a fancy file (45 minutes ago) [Matthew Brett]
+ * d304a73 - (origin/placeholder, placeholder) Merge pull request #48 from hhuuggoo/master (2 weeks ago) [Jonathan Terhorst]
+ |\
+ | * 4aff2a8 - fixed bug 35, and added a test in test_bugfixes (2 weeks ago) [Hugo]
+ |/
+ * a7ff2e5 - Added notes on discussion/proposal made during Data Array Summit. (2 weeks ago) [Corran Webster]
+ * 68f6752 - Initial implimentation of AxisIndexer - uses 'index_by' which needs to be changed to a call on an Axes object - this is all very sketchy right now. (2 weeks ago) [Corr
+ * 376adbd - Merge pull request #46 from terhorst/master (2 weeks ago) [Jonathan Terhorst]
+ |\
+ | * b605216 - updated joshu example to current api (3 weeks ago) [Jonathan Terhorst]
+ | * 2e991e8 - add testing for outer ufunc (3 weeks ago) [Jonathan Terhorst]
+ | * 7beda5a - prevent axis from throwing an exception if testing equality with non-axis object (3 weeks ago) [Jonathan Terhorst]
+ | * 65af65e - convert unit testing code to assertions (3 weeks ago) [Jonathan Terhorst]
+ | * 956fbab - Merge remote-tracking branch 'upstream/master' (3 weeks ago) [Jonathan Terhorst]
+ | |\
+ | |/
+
+Thanks to Yury V. Zaytsev for posting it.
.. include:: links.inc
diff --git a/doc/devel/gitwash/development_workflow.rst b/doc/devel/gitwash/development_workflow.rst
index 9251d4a..6f499e5 100644
--- a/doc/devel/gitwash/development_workflow.rst
+++ b/doc/devel/gitwash/development_workflow.rst
@@ -1,75 +1,104 @@
+.. highlight:: bash
+
.. _development-workflow:
-=========================
-Git Development workflow
-=========================
+####################
+Development workflow
+####################
-You've discovered a bug or something else you want to change
-in matplotlib_ .. |emdash| excellent!
+You already have your own forked copy of the `Matplotlib`_ repository, by
+following :ref:`forking`. You have :ref:`set-up-fork`. You have configured
+git by following :ref:`configure-git`. Now you are ready for some real work.
-You've worked out a way to fix it |emdash| even better!
+Workflow summary
+================
-You want to tell us about it |emdash| best of all!
+In what follows we'll refer to the upstream Matplotlib ``master`` branch, as
+"trunk".
-The easiest way to contribute to matplotlib_ is through github_. If
-for some reason you don't want to use github, see
-:ref:`making-patches` for instructions on how to email patches to the
-mailing list.
+* Don't use your ``master`` branch for anything. Consider deleting it.
+* When you are starting a new set of changes, fetch any changes from trunk,
+ and start a new *feature branch* from that.
+* Make a new branch for each separable set of changes |emdash| "one task, one
+ branch" (`ipython git workflow`_).
+* Name your branch for the purpose of the changes - e.g.
+ ``bugfix-for-issue-14`` or ``refactor-database-code``.
+* If you can possibly avoid it, avoid merging trunk or any other branches into
+ your feature branch while you are working.
+* If you do find yourself merging from trunk, consider :ref:`rebase-on-trunk`
+* Ask on the `Matplotlib mailing list`_ if you get stuck.
+* Ask for code review!
-You already have your own forked copy of the matplotlib_ repository, by
-following :ref:`forking`, :ref:`set-up-fork`, and you have configured
-git_ by following :ref:`configure-git`.
+This way of working helps to keep work well organized, with readable history.
+This in turn makes it easier for project maintainers (that might be you) to see
+what you've done, and why you did it.
-Workflow summary
-================
+See `linux git workflow`_ and `ipython git workflow`_ for some explanation.
-* Keep your ``master`` branch clean of edits that have not been merged
- to the main matplotlib_ development repo. Your ``master`` then will follow
- the main matplotlib_ repository.
-* Start a new *feature branch* for each set of edits that you do.
-* Do not merge the ``master`` branch or maintenance tracking branches
- into your feature branch. If you need to include commits from upstream
- branches (either to pick up a bug fix or to resolve a conflict) please
- *rebase* your branch on the upstream branch.
-* Ask for review!
+Consider deleting your master branch
+====================================
-This way of working really helps to keep work well organized, and in
-keeping history as clear as possible.
+It may sound strange, but deleting your own ``master`` branch can help reduce
+confusion about which branch you are on. See `deleting master on github`_ for
+details.
-See |emdash| for example |emdash| `linux git workflow`_.
+.. _update-mirror-trunk:
-Making a new feature branch
-===========================
+Update the mirror of trunk
+==========================
-::
+First make sure you have done :ref:`linking-to-upstream`.
- git checkout -b my-new-feature master
+From time to time you should fetch the upstream (trunk) changes from github::
-This will create and immediately check out a feature branch based on
-``master``. To create a feature branch based on a maintenance branch,
-use::
+ git fetch upstream
+
+This will pull down any commits you don't have, and set the remote branches to
+point to the right commit. For example, 'trunk' is the branch referred to by
+(remote/branchname) ``upstream/master`` - and if there have been commits since
+you last checked, ``upstream/master`` will change after you do the fetch.
+
+.. _make-feature-branch:
+
+Make a new feature branch
+=========================
+
+When you are ready to make some changes to the code, you should start a new
+branch. Branches that are for a collection of related edits are often called
+'feature branches'.
- git fetch origin
- git checkout -b my-new-feature origin/v1.0.x
+Making an new branch for each set of related changes will make it easier for
+someone reviewing your branch to see what you are doing.
-Generally, you will want to keep this also on your public GitHub_ fork
-of matplotlib_. To do this, you `git push`_ this new branch up to your GitHub_
-repo. Generally (if you followed the instructions in these pages, and
-by default), git will have a link to your GitHub_ repo, called
-``origin``. You push up to your own repo on GitHub_ with::
+Choose an informative name for the branch to remind yourself and the rest of us
+what the changes in the branch are for. For example ``add-ability-to-fly``, or
+``buxfix-for-issue-42``.
+
+::
+
+ # Update the mirror of trunk
+ git fetch upstream
+ # Make new feature branch starting at current trunk
+ git branch my-new-feature upstream/master
+ git checkout my-new-feature
+
+Generally, you will want to keep your feature branches on your public github_
+fork of `Matplotlib`_. To do this, you `git push`_ this new branch up to your
+github repo. Generally (if you followed the instructions in these pages, and by
+default), git will have a link to your github repo, called ``origin``. You push
+up to your own repo on github with::
git push origin my-new-feature
-You will need to use this exact command, rather than simply ``git
-push`` every time you want to push changes on your feature branch to
-your GitHub_ repo. However, in git >1.7 you can set up a link by
-using the ``--set-upstream`` option::
+In git >= 1.7 you can ensure that the link is correctly set by using the
+``--set-upstream`` option::
git push --set-upstream origin my-new-feature
-and then next time you need to push changes to your branch a simple
-``git push`` will suffice. Note that ``git push`` pushes out all
-branches that are linked to a remote branch.
+From now on git will know that ``my-new-feature`` is related to the
+``my-new-feature`` branch in the github repo.
+
+.. _edit-flow:
The editing workflow
====================
@@ -89,19 +118,21 @@ In more detail
#. Make some changes
#. See which files have changed with ``git status`` (see `git status`_).
- You'll see a listing like this one::
+ You'll see a listing like this one:
+
+ .. code-block:: none
# On branch ny-new-feature
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
- # modified: README
+ # modified: README
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
... 21273 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git
More information about the Python-modules-commits
mailing list