Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 26495bf

Browse files
bellmjbellmj
committed
Merge branch 'master' of https://github.com/matplotlib/matplotlib into fillBetweenExampleBranch
2 parents f961ae9 + 304154c commit 26495bf

71 files changed

Lines changed: 1222 additions & 1139 deletions

Some content is hidden

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

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ pip-run: &pip-install
5252
# Upgrade pip and setuptools and wheel to get as clean an install as possible
5353
name: Upgrade pip, setuptools, wheel
5454
command: |
55-
pip install --upgrade --user pip
56-
pip install --upgrade --user wheel
57-
pip install --upgrade --user setuptools
55+
python -mpip install --upgrade --user pip
56+
python -mpip install --upgrade --user wheel
57+
python -mpip install --upgrade --user setuptools
5858
5959
deps-run: &deps-install
6060
name: Install Python dependencies
6161
command: |
62-
pip install --user numpy${NUMPY_VERSION} codecov coverage
63-
pip install --user -r doc-requirements.txt
62+
python -mpip install --user numpy${NUMPY_VERSION} codecov coverage
63+
python -mpip install --user -r doc-requirements.txt
6464
6565
mpl-run: &mpl-install
6666
name: Install Matplotlib
67-
command: pip install --user -ve .
67+
command: python -mpip install --user -ve .
6868

6969
doc-run: &doc-build
7070
name: Build documentation

‎README.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ You've worked out a way to fix it – even better!
8484
You want to tell us about it – best of all!
8585

8686
Start at the `contributing guide <http://matplotlib.org/devdocs/devel/contributing.html>`_!
87+
88+
Developer notes are now at `Developer Discussions <https://github.com/orgs/matplotlib/teams/developers/discussions>`_

‎doc/_static/mpl.css‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,11 @@ h2 {
309309
margin: 0.5em 0 0.2em 0;
310310
padding-top: 0.5em;
311311
font-size: 1.7em;
312-
padding: 0;
313312
}
314313

315314
h3 {
316315
margin: 0.2em 0 0.1em 0;
316+
padding-top: 0.5em;
317317
font-size: 1.2em;
318318
}
319319

@@ -702,7 +702,7 @@ table.docutils.field-list {
702702
padding: 10px;
703703
text-align: left;
704704
vertical-align: top;
705-
width: 120px;
705+
width: 125px;
706706
}
707707
.docutils.field-list td {
708708
padding: 10px 10px 10px 20px;
@@ -846,14 +846,12 @@ figcaption {
846846
}
847847

848848
#sidebar-donations {
849-
margin-top: 28px;
849+
margin-top: 40px;
850850
}
851851

852852
.donate_button {
853853
background:#11557C;
854854
font-weight:normal;
855-
border:solid 1px #fff;
856-
outline: solid 1px #11557C;
857855
clear: both;
858856
display: block;
859857
width:200px;
@@ -864,6 +862,7 @@ figcaption {
864862
color:#fff;
865863
text-decoration: none;
866864
margin: 30px auto 0;
865+
border-radius: 6px;
867866
z-index:1;
868867
transition: background .25s ease;
869868
}
@@ -972,3 +971,13 @@ p.sphx-glr-signature a.reference.external {
972971
font-weight: 400;
973972
}
974973

974+
.sidebar-announcement {
975+
border: 1px solid #11557C;
976+
background: #eff9ff;
977+
padding: 2px;
978+
margin-top: 40px;
979+
}
980+
981+
.sidebar-announcement p {
982+
margin: 0.4em 0.4em 0.6em 0.4em;
983+
}

‎doc/_templates/sidebar_announcement.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="sidebar-announcement">
2+
<p>The upcoming version Matplotlib 3.0 will be Python 3 only.</p>
3+
<p>For Python 2 support, Matplotlib 2.2.x will be continued as a LTS release
4+
and updated with bugfixes until January 1, 2020.</p>
5+
</div>

‎doc/api/api_changes/2017-11-25-JMK.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
`.Axes.get_position` now returns actual position if aspect changed
2+
------------------------------------------------------------------
3+
4+
`.Axes.get_position` used to return the original position unless a
5+
draw had been triggered or `.Axes.apply_aspect` had been called, even
6+
if the kwarg *original* was set to *False*. Now `.Axes.apply_aspect`
7+
is called so ``ax.get_position()`` will return the new modified position.
8+
To get the old behaviour, ``ax.get_position(original=True)``.

‎doc/api/next_api_changes/2017-12-12-JMK.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
`.Axes.hist2d` now uses `~.Axes.pcolormesh` instead of `~.Axes.pcolorfast`
2+
--------------------------------------------------------------------------
3+
4+
`.Axes.hist2d` now uses `~.Axes.pcolormesh` instead of `~.Axes.pcolorfast`,
5+
which will improve the handling of log-axes. Note that the
6+
returned *image* now is of type `~.matplotlib.collections.QuadMesh`
7+
instead of `~.matplotlib.image.AxesImage`.

‎doc/conf.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ def _check_deps():
233233

234234
# Custom sidebar templates, maps page names to templates.
235235
html_sidebars = {
236-
'index': ['searchbox.html', 'donate_sidebar.html'],
236+
'index': ['searchbox.html', 'sidebar_announcement.html',
237+
'donate_sidebar.html'],
237238
'**': ['searchbox.html', 'localtoc.html', 'relations.html',
238239
'pagesource.html']
239240
}

‎doc/devel/MEP/MEP08.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
Status
1010
======
1111

12-
**Discussion**
12+
**Completed**
13+
14+
We are currently enforcing a sub-set of pep8 on new code contributions.
1315

1416
Branches and Pull requests
1517
==========================

‎doc/devel/MEP/MEP09.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ by the user.
1111

1212
Status
1313
======
14+
1415
**Discussion**
1516

1617
Branches and Pull requests

‎doc/devel/MEP/MEP10.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ Status
99

1010
**Progress**
1111

12-
Targeted for 1.3
12+
This is still an on-going effort
1313

1414
Branches and Pull requests
1515
==========================
1616

17-
#1665
18-
#1757
19-
#1795
2017

2118
Abstract
2219
========

0 commit comments

Comments
 (0)