10BC0 Merge branch 'master' into issue_8946 · matplotlib/matplotlib@5a1a82c · GitHub
[go: up one dir, main page]
Skip to content

Commit 5a1a82c

Browse files
l-johnstonl-johnston
authored
Merge branch 'master' into issue_8946
2 parents e697fbd + 327cfcf commit 5a1a82c

File tree

146 files changed

+1964
-1751
lines changed

Some content is hidden

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

146 files changed

+1964
-1751
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:

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
Matplotlib follows the Python Software Foundation Code of Conduct in everything we do,
22
see https://www.python.org/psf/conduct/.
3+
4+
Report violations to matplotlib@numfocus.o 48B1 rg, which is checked by Hannah Aizenman (@story645) and Thomas Caswell (@tacaswell).
5+
6+
You can also use the NumFocus Code of Conduct [Reporting Form](https://numfocus.typeform.com/to/ynjGdT).

‎.github/workflows/cibuildwheel.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
CIBW_SKIP: "cp35-* cp36-*"
4343
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
4444
CIBW_MANYLINUX_I686_IMAGE: manylinux1
45-
CIBW_BEFORE_BUILD: pip install numpy==1.15
45+
CIBW_BEFORE_BUILD: pip install certifi C30F numpy==1.15
4646
MPL_DISABLE_FH4: "yes"
4747

4848
- name: Build wheels for CPython 3.6
@@ -52,7 +52,7 @@ jobs:
5252
CIBW_BUILD: "cp36-*"
5353
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
5454
CIBW_MANYLINUX_I686_IMAGE: manylinux1
55-
CIBW_BEFORE_BUILD: pip install numpy==1.15
55+
CIBW_BEFORE_BUILD: pip install certifi numpy==1.15
5656
MPL_DISABLE_FH4: "yes"
5757
if: >
5858
startsWith(github.ref, 'refs/heads/v3.3') ||
@@ -63,7 +63,7 @@ jobs:
6363
python -m cibuildwheel --output-dir dist
6464
env:
6565
CIBW_BUILD: "pp3?-*"
66-
CIBW_BEFORE_BUILD: pip install numpy==1.15
66+
CIBW_BEFORE_BUILD: pip install certifi numpy==1.15
6767
if: >
6868
runner.os != 'Windows' && (
6969
startsWith(github.ref, 'refs/heads/v3.3') ||

‎doc/_static/mpl.css‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -245,20 +245,6 @@ div.sphinxsidebar {
245245
/* margin-left: -100%; */
246246
}
247247

248-
div.sphinxsidebar h4, div.sphinxsidebar h3 {
249-
margin: 1em 0 0.5em 0;
250-
font-size: 0.9em;
251-
padding: 0.1em 0 0.1em 0.5em;
252-
color: white;
253-
border: 1px solid #86989B;
254-
background-color: #AFC1C4;
255-
}
256-
257-
div.sphinxsidebar h3 a {
258-
/* workaround for table of contents heading, which is a link */
259-
color: white !important;
260-
}
261-
262248
div.sphinxsidebar ul {
263249
padding-left: 1.5em;
264250
margin-top: 10px;

‎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/axis_api.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ Data and view intervals
121121

122122
Axis.get_data_interval
123123
Axis.get_view_interval
124+
Axis.get_inverted
124125
Axis.set_data_interval
125126
Axis.set_view_interval
127+
Axis.set_inverted
126128

127129
Rendering helpers
128130
-----------------

‎doc/api/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ Matplotlib consists of the following submodules:
119119
texmanager_api.rst
120120
textpath_api.rst
121121
ticker_api.rst
122+
tight_bbox_api.rst
122123
tight_layout_api.rst
123124
transformations.rst
124125
tri_api.rst

‎doc/api/next_api_changes/behavior/15127-TAC.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Raise or warn on registering a colormap twice
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
When using `matplotlib.cm.register_cmap` to register a user provided
5+
or third-party colormap it will now raise a `ValueError` if trying to
6+
over-write one of the built in colormaps and warn if trying to over
7+
write a user registered colormap. This may raise for user-registered
8+
colormaps in the future.

‎doc/api/next_api_changes/behavior/18560-AL.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Parasite Axes pcolor and pcolormesh now defaults to placing grid edges at integers, not half-integers
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
This is consistent with `~.Axes.pcolor` and `~.Axes.pcolormesh`.

‎doc/api/next_api_changes/behavior/18564-AL.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Axes3D no longer adds itself to figure
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
New `.Axes3D` objects previously added themselves to figures when they were
5+
created, which lead to them being added twice if
6+
``fig.add_subplot(111, projection='3d')`` was called. Now ``ax = Axes3d(fig)``
7+
will need to be explicitly added to the figure with ``fig.add_axes(ax)``, as
8+
also needs to be done for normal `.axes.Axes`.

0 commit comments

Comments
 (0)
0