Skip to content

Commit f8ba9d3

Browse files
rohit-rawat-amdocsrohit-rawat-amdocs
committed
Merge branch 'master' of https://github.com/xordux/matplotlib into navigate_mode_18151
2 parents 3e34724 + 5c486d7 commit f8ba9d3

File tree

215 files changed

+5884
-5661
lines changed

Some content is hidden

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

215 files changed

+5884
-5661
lines changed

‎.circleci/config.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,15 @@ commands:
8787
command: |
8888
# Set epoch to date of latest tag.
8989
export SOURCE_DATE_EPOCH="$(git log -1 --format=%at $(git describe --abbrev=0))"
90-
make html O=-T
90+
# Include analytics only when deploying to devdocs.
91+
if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
92+
[ "$CIRCLE_BRANCH" != "master" ] || \
93+
[[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
94+
export ANALYTICS=False
95+
else
96+
export ANALYTICS=True
97+
fi
98+
make html O="-T -Ainclude_analytics=$ANALYTICS"
9199
rm -r build/html/_sources
92100
working_directory: doc
93101
- save_cache:

‎.coveragerc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ omit = matplotlib/_version.py
77

88
[report]
99
exclude_lines =
10+
pragma: no cover
1011
raise NotImplemented
1112
def __str__
1213
def __repr__

‎.flake8‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ per-file-ignores =
5050

5151
lib/matplotlib/__init__.py: F401
5252
lib/matplotlib/_cm.py: E202, E203, E302
53+
lib/matplotlib/_mathtext.py: E221, E251
5354
lib/matplotlib/_mathtext_data.py: E203, E261
5455
lib/matplotlib/animation.py: F401
5556
lib/matplotlib/axes/__init__.py: F401, F403
@@ -162,6 +163,7 @@ per-file-ignores =
162163
examples/lines_bars_and_markers/fill.py: E402
163164
examples/lines_bars_and_markers/fill_between_demo.py: E402
164165
examples/lines_bars_and_markers/filled_step.py: E402
166+
examples/lines_bars_and_markers/stairs_demo.py: E402
165167
examples/lines_bars_and_markers/horizontal_barchart_distribution.py: E402
166168
examples/lines_bars_and_markers/joinstyle.py: E402
167169
examples/lines_bars_and_markers/scatter_hist.py: E402

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Matplotlib follows the Python Software Foundation Code of Conduct in everything we do,
2+
see https://www.python.org/psf/conduct/.

‎.travis.yml‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,28 @@ install:
133133
# install was successful by trying to import the toolkit (sometimes, the
134134
# install appears to be successful but shared libraries cannot be loaded at
135135
# runtime, so an actual import is a better check).
136-
python -mpip install --upgrade pycairo cairocffi>=0.8
137-
python -mpip install --upgrade PyGObject &&
138-
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
139-
echo 'PyGObject is available' ||
140-
echo 'PyGObject is not available'
141-
python -mpip install --upgrade pyqt5 &&
142-
python -c 'import PyQt5.QtCore' &&
143-
echo 'PyQt5 is available' ||
144-
echo 'PyQt5 is not available'
145-
python -mpip install --upgrade pyside2 &&
146-
python -c 'import PySide2.QtCore' &&
147-
echo 'PySide2 is available' ||
148-
echo 'PySide2 is not available'
136+
137+
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12
138+
139+
# There are not functioning wheels available for OSX 10.12 (as of
140+
# Sept 2020) for either pyqt5 (there are only wheels for 10.13+)
141+
# or pyside2 (the latest version (5.13.2) with 10.12 wheels has a
142+
# fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
143+
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
144+
python -mpip install --upgrade pycairo cairocffi>=0.8
145+
python -mpip install --upgrade PyGObject &&
146+
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
147+
echo 'PyGObject is available' ||
148+
echo 'PyGObject is not available'
149+
python -mpip install --upgrade pyqt5 &&
150+
python -c 'import PyQt5.QtCore' &&
151+
echo 'PyQt5 is available' ||
152+
echo 'PyQt5 is not available'
153+
python -mpip install --upgrade pyside2 &&
154+
python -c 'import PySide2.QtCore' &&
155+
echo 'PySide2 is available' ||
156+
echo 'PySide2 is not available'
157+
fi
149158
python -mpip install --upgrade \
150159
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
151160
wxPython &&

‎doc/MCSE.2007.55.bib‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@Article{Hunter:2007,
2+
Author = {Hunter, J. D.},
3+
Title = {Matplotlib: A 2D graphics environment},
4+
Journal = {Computing in Science \& Engineering},
5+
Volume = {9},
6+
Number = {3},
7+
Pages = {90--95},
8+
abstract = {Matplotlib is a 2D graphics package used for Python for
9+
application development, interactive scripting, and publication-quality
10+
image generation across user interfaces and operating systems.},
11+
publisher = {IEEE COMPUTER SOC},
12+
doi = {10.1109/MCSE.2007.55},
13+
year = 2007
14+
}

‎doc/_static/zenodo_cache/4030140.svg‎

Lines changed: 35 additions & 0 deletions
Loading

‎doc/_templates/layout.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
{%- endif %}
9797
</div>
9898
</footer>
99+
{%- if include_analytics %}
99100
<script>
100101
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
101102
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -106,4 +107,5 @@
106107
ga('send', 'pageview');
107108

108109
</script>
110+
{%- endif %}
109111
{%- endblock %}

‎doc/api/artist_api.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
``matplotlib.artist``
55
*********************
66

7-
.. inheritance-diagram:: matplotlib.axes._axes.Axes matplotlib.axes._base._AxesBase matplotlib.axis.Axis matplotlib.axis.Tick matplotlib.axis.XAxis matplotlib.axis.XTick matplotlib.axis.YAxis matplotlib.axis.YTick matplotlib.collections.AsteriskPolygonCollection matplotlib.collections.BrokenBarHCollection matplotlib.collections.CircleCollection matplotlib.collections.Collection matplotlib.collections.EllipseCollection matplotlib.collections.EventCollection matplotlib.collections.LineCollection matplotlib.collections.PatchCollection matplotlib.collections.PathCollection matplotlib.collections.PolyCollection matplotlib.collections.QuadMesh matplotlib.collections.RegularPolyCollection matplotlib.collections.StarPolygonCollection matplotlib.collections.TriMesh matplotlib.collections._CollectionWithSizes matplotlib.contour.ClabelText matplotlib.figure.Figure matplotlib.image.AxesImage matplotlib.image.BboxImage matplotlib.image.FigureImage matplotlib.image.NonUniformImage matplotlib.image.PcolorImage matplotlib.image._ImageBase matplotlib.legend.Legend matplotlib.lines.Line2D matplotlib.offsetbox.AnchoredOffsetbox matplotlib.offsetbox.AnchoredText matplotlib.offsetbox.AnnotationBbox matplotlib.offsetbox.AuxTransformBox matplotlib.offsetbox.DrawingArea matplotlib.offsetbox.HPacker matplotlib.offsetbox.OffsetBox matplotlib.offsetbox.OffsetImage matplotlib.offsetbox.PackerBase matplotlib.offsetbox.PaddedBox matplotlib.offsetbox.TextArea matplotlib.offsetbox.VPacker matplotlib.patches.Arc matplotlib.patches.Arrow matplotlib.patches.Circle matplotlib.patches.CirclePolygon matplotlib.patches.ConnectionPatch matplotlib.patches.Ellipse matplotlib.patches.FancyArrow matplotlib.patches.FancyArrowPatch matplotlib.patches.FancyBboxPatch matplotlib.patches.Patch matplotlib.patches.PathPatch matplotlib.patches.Polygon matplotlib.patches.Rectangle matplotlib.patches.RegularPolygon matplotlib.patches.Shadow matplotlib.patches.Wedge matplotlib.projections.geo.AitoffAxes matplotlib.projections.geo.GeoAxes matplotlib.projections.geo.HammerAxes matplotlib.projections.geo.LambertAxes matplotlib.projections.geo.MollweideAxes matplotlib.projections.polar.PolarAxes matplotlib.quiver.Barbs matplotlib.quiver.Quiver matplotlib.quiver.QuiverKey matplotlib.spines.Spine matplotlib.table.Cell matplotlib.table.CustomCell matplotlib.table.Table matplotlib.text.Annotation matplotlib.text.Text
7+
.. inheritance-diagram:: matplotlib.axes._axes.Axes matplotlib.axes._base._AxesBase matplotlib.axis.Axis matplotlib.axis.Tick matplotlib.axis.XAxis matplotlib.axis.XTick matplotlib.axis.YAxis matplotlib.axis.YTick matplotlib.collections.AsteriskPolygonCollection matplotlib.collections.BrokenBarHCollection matplotlib.collections.CircleCollection matplotlib.collections.Collection matplotlib.collections.EllipseCollection matplotlib.collections.EventCollection matplotlib.collections.LineCollection matplotlib.collections.PatchCollection matplotlib.collections.PathCollection matplotlib.collections.PolyCollection matplotlib.collections.QuadMesh matplotlib.collections.RegularPolyCollection matplotlib.collections.StarPolygonCollection matplotlib.collections.TriMesh matplotlib.collections._CollectionWithSizes matplotlib.contour.ClabelText matplotlib.figure.Figure matplotlib.image.AxesImage matplotlib.image.BboxImage matplotlib.image.FigureImage matplotlib.image.NonUniformImage matplotlib.image.PcolorImage matplotlib.image._ImageBase matplotlib.legend.Legend matplotlib.lines.Line2D matplotlib.offsetbox.AnchoredOffsetbox matplotlib.offsetbox.AnchoredText matplotlib.offsetbox.AnnotationBbox matplotlib.offsetbox.AuxTransformBox matplotlib.offsetbox.DrawingArea matplotlib.offsetbox.HPacker matplotlib.offsetbox.OffsetBox matplotlib.offsetbox.OffsetImage matplotlib.offsetbox.PackerBase matplotlib.offsetbox.PaddedBox matplotlib.offsetbox.TextArea matplotlib.offsetbox.VPacker matplotlib.patches.Arc matplotlib.patches.Arrow matplotlib.patches.Circle matplotlib.patches.CirclePolygon matplotlib.patches.ConnectionPatch matplotlib.patches.Ellipse matplotlib.patches.FancyArrow matplotlib.patches.FancyArrowPatch matplotlib.patches.FancyBboxPatch matplotlib.patches.Patch matplotlib.patches.PathPatch matplotlib.patches.StepPatch matplotlib.patches.Polygon matplotlib.patches.Rectangle matplotlib.patches.RegularPolygon matplotlib.patches.Shadow matplotlib.patches.Wedge matplotlib.projections.geo.AitoffAxes matplotlib.projections.geo.GeoAxes matplotlib.projections.geo.HammerAxes matplotlib.projections.geo.LambertAxes matplotlib.projections.geo.MollweideAxes matplotlib.projections.polar.PolarAxes matplotlib.quiver.Barbs matplotlib.quiver.Quiver matplotlib.quiver.QuiverKey matplotlib.spines.Spine matplotlib.table.Cell matplotlib.table.CustomCell matplotlib.table.Table matplotlib.text.Annotation matplotlib.text.Text
88
:parts: 1
99
:private-bases:
1010

‎doc/api/axes_api.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Binned
137137
Axes.hexbin
138138
Axes.hist
139139
Axes.hist2d
140+
Axes.stairs
140141

141142
Contours
142143
--------

0 commit comments

Comments
 (0)