Commit bb4b823
committed
Merge remote-tracking branch 'origin/v3.2.x'
Conflicts:
ci/azure-pipelines-steps.yml
- removed on master branch
doc/_static/mpl.css
- whitespace
lib/matplotlib/axes/_axes.py
- kept master version, don't forward-port feature fill for older
numpys that we no longer support
lib/matplotlib/backend_bases.py
- PIL in required on master, don't forward port version checking fix
- kept master branch version on all doc changes
INSTALL.rst
doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst
doc/devel/coding_guide.rst
doc/devel/min_dep_policy.rst
doc/faq/howto_faq.rst
examples/user_interfaces/embedding_in_tk_sgskip.py
lib/matplotlib/backends/backend_agg.py
lib/matplotlib/image.py
lib/matplotlib/pyplot.py
lib/matplotlib/tests/test_axes.py
lib/matplotlib/tests/test_colorbar.py
lib/matplotlib/tests/test_fontconfig_pattern.py
lib/mpl_toolkits/axes_grid1/axes_grid.py
lib/mpl_toolkits/mplot3d/axes3d.py
- kept master branch versionFile tree
6 files changed
+1033
-190
lines changed- doc
- _static
- _templates
- users
- prev_whats_new
- lib/mpl_toolkits/tests
6 files changed
+1033
-190
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
1150 | 1150 | | |
1151 | 1151 | | |
1152 | 1152 | | |
1153 | | - | |
| 1153 | + | |
1154 | 1154 | | |
1155 | 1155 | | |
1156 | 1156 | | |
1157 | 1157 | | |
1158 | 1158 | | |
1159 | 1159 | | |
1160 | | - | |
| 1160 | + | |
1161 | 1161 | | |
1162 | 1162 | | |
1163 | 1163 | | |
| |||
1166 | 1166 | | |
1167 | 1167 | | |
1168 | 1168 | | |
1169 | | - | |
| 1169 | + | |
1170 | 1170 | | |
1171 | 1171 | | |
1172 | 1172 | | |
| |||
1217 | 1217 | | |
1218 | 1218 | | |
1219 | 1219 | | |
1220 | | - | |
| 1220 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
| 98 | + | |
99 | 99 | | |
100 | | - | |
| 100 | + | |
0 commit comments