8000 Revert "Merge branch 'add_legend_labelcolor_rcParam' of github.com:Ca… · matplotlib/matplotlib@49ac9a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 49ac9a2

Browse files
CarloscerqCarloscerq
committed
Revert "Merge branch 'add_legend_labelcolor_rcParam' of github.com:Carloscerq/matplotlib into add_legend_labelcolor_rcParam"
This reverts commit 4f9a774, reversing changes made to ffbd8b9.
1 parent 4f9a774 commit 49ac9a2

File tree

194 files changed

+3297
-3841
lines changed

Some content is hidden

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

194 files changed

+3297
-3841
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
- pip-install
151151

152152
- deps-install:
153-
numpy_version: "==1.17.3"
153+
numpy_version: "==1.16.0"
154154
- mpl-install
155155

156156
- doc-build

‎.flake8

Lines changed: 166 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ per-file-ignores =
4545
setupext.py: E501
4646
tests.py: F401
4747

48+
tools/subset.py: E221, E251, E261, E302, E501
49+
4850
lib/matplotlib/__init__.py: F401
4951
lib/matplotlib/_api/__init__.py: F401
5052
lib/matplotlib/_cm.py: E202, E203, E302
@@ -58,7 +60,7 @@ per-file-ignores =
5860
lib/matplotlib/backends/qt_editor/formlayout.py: F401, F403
5961
lib/matplotlib/cbook/__init__.py: F401
6062
lib/matplotlib/cbook/deprecation.py: F401
61-
lib/matplotlib/font_manager.py: E501
63+
lib/matplotlib/font_manager.py: E221, E251, E501
6264
lib/matplotlib/image.py: F401, F403
6365
lib/matplotlib/lines.py: F401
6466
lib/matplotlib/mathtext.py: E221, E251
@@ -110,20 +112,179 @@ per-file-ignores =
110112
tutorials/toolkits/axisartist.py: E501
111113

112114
examples/animation/frame_grabbing_sgskip.py: E402
113-
examples/images_contours_and_fields/tricontour_demo.py: E201
114-
examples/images_contours_and_fields/tripcolor_demo.py: E201
115-
examples/images_contours_and_fields/triplot_demo.py: E201
115+
examples/axes_grid1/inset_locator_demo.py: E402
116+
examples/axes_grid1/scatter_hist_locatable_axes.py: E402
117+
examples/axisartist/demo_curvelinear_grid.py: E402
118+
examples/color/color_by_yvalue.py: E402
119+
examples/color/color_cycle_default.py: E402
120+
10000 examples/color/color_cycler.py: E402
121+
examples/color/color_demo.py: E402
122+
examples/color/colorbar_basics.py: E402
123+
examples/color/colormap_reference.py: E402
124+
examples/color/custom_cmap.py: E402
125+
examples/color/named_colors.py: E402
126+
examples/images_contours_and_fields/affine_image.py: E402
127+
examples/images_contours_and_fields/barb_demo.py: E402
128+
examples/images_contours_and_fields/barcode_demo.py: E402
129+
examples/images_contours_and_fields/contour_corner_mask.py: E402
130+
examples/images_contours_and_fields/contour_demo.py: E402
131+
examples/images_contours_and_fields/contour_image.py: E402
132+
examples/images_contours_and_fields/contourf_demo.py: E402
133+
examples/images_contours_and_fields/contourf_hatching.py: E402
134+
examples/images_contours_and_fields/contourf_log.py: E402
135+
examples/images_contours_and_fields/demo_bboximage.py: E402
136+
examples/images_contours_and_fields/image_antialiasing.py: E402
137+
examples/images_contours_and_fields/image_clip_path.py: E402
138+
examples/images_contours_and_fields/image_demo.py: E402
139+
examples/images_contours_and_fields/image_masked.py: E402
140+
examples/images_contours_and_fields/image_transparency_blend.py: E402
141+
examples/images_contours_and_fields/image_zcoord.py: E402
142+
examples/images_contours_and_fields/interpolation_methods.py: E402
143+
examples/images_contours_and_fields/irregulardatagrid.py: E402
144+
examples/images_contours_and_fields/layer_images.py: E402
145+
examples/images_contours_and_fields/matshow.py: E402
146+
examples/images_contours_and_fields/multi_image.py: E402
147+
examples/images_contours_and_fields/pcolor_demo.py: E402
148+
examples/images_contours_and_fields/plot_streamplot.py: E402
149+
examples/images_contours_and_fields/quadmesh_demo.py: E402
150+
examples/images_contours_and_fields/quiver_demo.py: E402
151+
examples/images_contours_and_fields/quiver_simple_demo.py: E402
152+
examples/images_contours_and_fields/shading_example.py: E402
153+
examples/images_contours_and_fields/specgram_demo.py: E402
154+
examples/images_contours_and_fields/spy_demos.py: E402
155+
examples/images_contours_and_fields/tricontour_demo.py: E201, E402
156+
examples/images_contours_and_fields/tricontour_smooth_delaunay.py: E402
157+
examples/images_contours_and_fields/tricontour_smooth_user.py: E402
158+
examples/images_contours_and_fields/trigradient_demo.py: E402
159+
examples/images_contours_and_fields/triinterp_demo.py: E402
160+
examples/images_contours_and_fields/tripcolor_demo.py: E201, E402
161+
examples/images_contours_and_fields/triplot_demo.py: E201, E402
162+
examples/images_contours_and_fields/watermark_image.py: E402
163+
examples/lines_bars_and_markers/curve_error_band.py: E402
164+
examples/lines_bars_and_markers/errorbar_limits_simple.py: E402
165+
examples/lines_bars_and_markers/fill.py: E402
166+
examples/lines_bars_and_markers/fill_between_demo.py: E402
167+
examples/lines_bars_and_markers/filled_step.py: E402
168+
examples/lines_bars_and_markers/stairs_demo.py: E402
169+
examples/lines_bars_and_markers/horizontal_barchart_distribution.py: E402
170+
examples/lines_bars_and_markers/joinstyle.py: E402
171+
examples/lines_bars_and_markers/scatter_hist.py: E402
172+
examples/lines_bars_and_markers/scatter_piecharts.py: E402
173+
examples/lines_bars_and_markers/scatter_with_legend.py: E402
174+
examples/lines_bars_and_markers/span_regions.py: E402
175+
examples/lines_bars_and_markers/stem_plot.py: E402
176+
examples/lines_bars_and_markers/step_demo.py: E402
177+
examples/lines_bars_and_markers/timeline.py: E402
178+
examples/lines_bars_and_markers/xcorr_acorr_demo.py: E402
179+
examples/misc/agg_buffer.py: E402
180+
examples/misc/histogram_path.py: E402
116181
examples/misc/print_stdout_sgskip.py: E402
182+
examples/misc/rasterization_demo.py: E402
183+
examples/misc/svg_filter_line.py: E402
184+
examples/misc/svg_filter_pie.py: E402
117185
examples/misc/table_demo.py: E201
186+
examples/mplot3d/surface3d.py: E402
187+
examples/pie_and_polar_charts/bar_of_pie.py: E402
188+
examples/pie_and_polar_charts/nested_pie.py: E402
189+
examples/pie_and_polar_charts/pie_and_donut_labels.py: E402
190+
examples/pie_and_polar_charts/pie_demo2.py: E402
191+
examples/pie_and_polar_charts/pie_features.py: E402
192+
examples/pie_and_polar_charts/polar_bar.py: E402
193+
examples/pie_and_polar_charts/polar_demo.py: E402
194+
examples/pie_and_polar_charts/polar_legend.py: E402
195+
examples/pie_and_polar_charts/polar_scatter.py: E402
196+
examples/pyplots/align_ylabels.py: E402
197+
examples/pyplots/annotate_transform.py: E251, E402
198+
examples/pyplots/annotation_basic.py: E402
199+
examples/pyplots/annotation_polar.py: E402
200+
examples/pyplots/auto_subplots_adjust.py: E302, E402
201+
examples/pyplots/axline.py: E402
202+
examples/pyplots/boxplot_demo_pyplot.py: E402
203+
examples/pyplots/dollar_ticks.py: E402
204+
examples/pyplots/fig_axes_customize_simple.py: E402
205+
examples/pyplots/fig_axes_labels_simple.py: E402
206+
examples/pyplots/fig_x.py: E402
207+
examples/pyplots/pyplot_formatstr.py: E402
208+
examples/pyplots/pyplot_mathtext.py: E402
209+
examples/pyplots/pyplot_scales.py: E402
210+
examples/pyplots/pyplot_simple.py: E402
211+
examples/pyplots/pyplot_text.py: E402
212+
examples/pyplots/pyplot_three.py: E402
213+
examples/pyplots/pyplot_two_subplots.py: E402
214+
examples/pyplots/text_commands.py: E402
215+
examples/pyplots/text_layout.py: E402
216+
examples/pyplots/whats_new_1_subplot3d.py: E402
217+
examples/pyplots/whats_new_98_4_fill_between.py: E402
218+
examples/pyplots/whats_new_98_4_legend.py: E402
219+
examples/pyplots/whats_new_99_axes_grid.py: E402
220+
examples/pyplots/whats_new_99_mplot3d.py: E402
221+
examples/pyplots/whats_new_99_spines.py: E402
222+
examples/scales/power_norm.py: E402
223+
examples/scales/scales.py: E402
224+
examples/shapes_and_collections/artist_reference.py: E402
225+
examples/shapes_and_collections/collections.py: E402
226+
examples/shapes_and_collections/compound_path.py: E402
227+
examples/shapes_and_collections/dolphin.py: E402
228+
examples/shapes_and_collections/donut.py: E402
229+
examples/shapes_and_collections/ellipse_collection.py: E402
230+
examples/shapes_and_collections/ellipse_demo.py: E402
231+
examples/shapes_and_collections/fancybox_demo.py: E402
232+
examples/shapes_and_collections/hatch_demo.py: E402
233+
examples/shapes_and_collections/hatch_style_reference.py: E402
234+
examples/shapes_and_collections/line_collection.py: E402
235+
examples/shapes_and_collections/marker_path.py: E402
236+
examples/shapes_and_collections/patch_collection.py: E402
237+
examples/shapes_and_collections/path_patch.py: E402
238+
examples/shapes_and_collections/quad_bezier.py: E402
239+
examples/shapes_and_collections/scatter.py: E402
240+
examples/showcase/anatomy.py: E402
241+
examples/showcase/bachelors_degrees_by_gender.py: E402
242+
examples/showcase/firefox.py: E501
243+
examples/specialty_plots/anscombe.py: E402
244+
examples/specialty_plots/radar_chart.py: E402
245+
examples/specialty_plots/sankey_basics.py: E402
246+
examples/specialty_plots/sankey_links.py: E402
247+
examples/specialty_plots/sankey_rankine.py: E402
248+
examples/specialty_plots/skewt.py: E402
118249
examples/style_sheets/bmh.py: E501
250+
examples/style_sheets/ggplot.py: E501
119251
examples/style_sheets/plot_solarizedlight2.py: E501
252+
examples/subplots_axes_and_figures/axes_margins.py: E402
253+
examples/subplots_axes_and_figures/axes_zoom_effect.py: E402
254+
examples/subplots_axes_and_figures/custom_figure_class.py: E402
120255
examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
256+
examples/subplots_axes_and_figures/demo_tight_layout.py: E402, E501
257+
examples/subplots_axes_and_figures/figure_size_units.py: E402
258+
examples/subplots_axes_and_figures/secondary_axis.py: E402
259+
examples/subplots_axes_and_figures/two_scales.py: E402
260+
examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
261+
examples/text_labels_and_annotations/date_index_formatter.py: E402
262+
examples/text_labels_and_annotations/demo_text_rotation_mode.py: E402
121263
examples/text_labels_and_annotations/custom_legends.py: E402
264+
examples/text_labels_and_annotations/fancyarrow_demo.py: E402
265+
examples/text_labels_and_annotations/font_family_rc_sgskip.py: E402
266+
examples/text_labels_and_annotations/font_file.py: E402
267+
examples/text_labels_and_annotations/legend.py: E402
268+
examples/text_labels_and_annotations/line_with_text.py: E402
269+
examples/text_labels_and_annotations/mathtext_asarray.py: E402
270+
examples/text_labels_and_annotations/tex_demo.py: E402
271+
examples/text_labels_and_annotations/watermark_text.py: E402
272+
examples/ticks_and_spines/custom_ticker1.py: E402
122273
examples/ticks_and_spines/date_concise_formatter.py: E402
274+
examples/ticks_and_spines/major_minor_demo.py: E402
275+
examples/ticks_and_spines/tick-formatters.py: E402
276+
examples/ticks_and_spines/tick_labels_from_values.py: E402
277+
examples/user_interfaces/canvasagg.py: E402
123278
examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
124279
examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
280+
examples/user_interfaces/embedding_in_qt_sgskip.py: E402
125281
examples/user_interfaces/gtk_spreadsheet_sgskip.py: E402
282+
examples/user_interfaces/mathtext_wx_sgskip.py: E402
126283
examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
127-
examples/user_interfaces/pylab_with_gtk_sgskip.py: E402
284+
examples/user_interfaces/pylab_with_gtk_sgskip.py: E302, E402
128285
examples/user_interfaces/toolmanager_sgskip.py: E402
286+
examples/userdemo/connectionstyle_demo.py: E402
287+
examples/userdemo/custom_boxstyle01.py: E402
129288
examples/userdemo/pgf_preamble_sgskip.py: E402
289+
examples/widgets/*.py: E402
290+
examples/statistics/*.py: E402

‎.github/workflows/cibuildwheel.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Build wheels on ${{ matrix.os }}
1414
runs-on: ${{ matrix.os }}
1515
env:
16-
min-numpy-version: "1.17.3"
17-
min-numpy-hash: "b6/d6/be8f975f5322336f62371c9abeb936d592c98c047ad63035f1b38ae08efe"
16+
min-numpy-version: "1.16.0"
17+
min-numpy-hash: "04/b6/d7faa70a3e3eac39f943cc6a6a64ce378259677de516bd899dd9eb8f9b32"
1818
strategy:
1919
matrix:
2020
os: [ubuntu-18.04, windows-latest, macos-latest]
@@ -57,7 +57,7 @@ jobs:
5757
cd numpy-${{ env.min-numpy-version }}
5858
python -m cibuildwheel --output-dir ../numpy-aarch64-cache
5959
env:
60-
CIBW_BUILD: "cp37-* cp38-*"
60+
CIBW_BUILD: "cp36-* cp37-* cp38-*"
6161
CIBW_ARCHS: aarch64
6262

6363
- name: Copy setup.cfg to configure wheel
@@ -86,6 +86,20 @@ jobs:
8686
MPL_DISABLE_FH4: "yes"
8787
CIBW_ARCHS: ${{ matrix.cibw_archs }}
8888

89+
- name: Build wheels for CPython 3.6
90+
run: |
91+
python -m cibuildwheel --output-dir dist
92+
env:
93+
CIBW_BUILD: "cp36-*"
94+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
95+
CIBW_MANYLINUX_I686_IMAGE: manylinux1
96+
CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
97+
MPL_DISABLE_FH4: "yes"
98+
CIBW_ARCHS: ${{ matrix.cibw_archs }}
99+
if: >
100+
startsWith(github.ref, 'refs/heads/v3.3') ||
101+
startsWith(github.ref, 'refs/tags/v3.3')
102+
89103
- name: Build wheels for PyPy
90104
run: |
91105
python -m cibuildwheel --output-dir dist

‎.github/workflows/circleci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
with:
1010
repo-token: ${{ secrets.GITHUB_TOKEN }}
1111
artifact-path: 0/doc/build/html/index.html
12-
circleci-jobs: docs-python37,docs-python38,docs-python38-min
12+
circleci-jobs: docs-python36,docs-python37,docs-python38

‎.github/workflows/tests.yml

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,21 @@ jobs:
2222
matrix:
2323
include:
2424
- name-suffix: "(Minimum Versions)"
25-
os: ubuntu-18.04
25+
os: ubuntu-16.04
2626
python-version: 3.7
2727
extra-requirements: '-c requirements/testing/minver.txt'
2828
pyqt5-ver: '==5.8 sip==4.19.7' # oldest versions with a Py3.7 wheel.
2929
delete-font-cache: true
3030
XVFB_RUN: xvfb-run -a
31-
- os: ubuntu-18.04
31+
- os: ubuntu-16.04
3232
python-version: 3.7
3333
extra-requirements: '-r requirements/testing/extra.txt'
3434
XVFB_RUN: xvfb-run -a
3535
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
36-
- os: ubuntu-18.04
36+
- os: ubuntu-16.04
3737
python-version: 3.8
3838
extra-requirements: '-r requirements/testing/extra.txt'
3939
XVFB_RUN: xvfb-run -a
40-
- os: ubuntu-20.04
41-
python-version: 3.9
42-
extra-requirements: '-r requirements/testing/extra.txt'
43-
XVFB_RUN: xvfb-run -a
4440
- os: macos-latest
4541
python-version: 3.8
4642
XVFB_RUN: ""
@@ -132,10 +128,10 @@ jobs:
132128
~/.cache/matplotlib
133129
!~/.cache/matplotlib/tex.cache
134130
!~/.cache/matplotlib/test_cache
135-
key: 1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
131+
key: ${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
136132
restore-keys: |
137-
1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
138-
1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
133+
${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
134+
${{ runner.os }}-py${{ matrix.python-version }}-mpl-
139135
140136
- name: Install Python dependencies
141137
run: |
@@ -160,8 +156,12 @@ jobs:
160156
# libraries cannot be loaded at runtime, so an actual import is a
161157
# better check).
162158
if [[ "${{ runner.os }}" != 'macOS' ]]; then
163-
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
164-
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
159+
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12;
160+
# pycairo 1.20+ requires a new version of Cairo, unavailable on
161+
# Ubuntu 16.04, so PyGObject must be installed without build
162+
# isolation in order to pick up the lower pre-installed version.
163+
python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
164+
python -m pip install --upgrade --no-build-isolation PyGObject &&
165165
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
166166
echo 'PyGObject is available' ||
167167
echo 'PyGObject is not available'
@@ -180,7 +180,7 @@ jobs:
180180
echo 'PySide2 is not available'
181181
fi
182182
python -m pip install --upgrade \
183-
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-$(lsb_release -r -s) \
183+
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
184184
wxPython &&
185185
python -c 'import wx' &&
186186
echo 'wxPython is available' ||
@@ -194,11 +194,7 @@ jobs:
194194
# Set flag in a delayed manner to avoid issues with installing other
195195
# packages
196196
if [[ "${{ runner.os }}" != 'macOS' ]]; then
197-
if [[ "$(lsb_release -r -s)" == "20.04" ]]; then
198-
export CPPFLAGS='--coverage -fprofile-abs-path'
199-
else
200-
export CPPFLAGS='--coverage'
201-
fi
197+
export CPPFLAGS=--coverage
202198
fi
203199
204200
# All dependencies must have been pre-installed, so that the minver
@@ -230,9 +226,3 @@ jobs:
230226
if: ${{ runner.os != 'macOS' }}
231227
- name: Upload code coverage
232228
uses: codecov/codecov-action@v1
233-
234-
- uses: actions/upload-artifact@v2
235-
if: failure()
236-
with:
237-
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} result images"
238-
path: ./result_images

‎azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
strategy:
77
matrix:
88
Linux_py37:
9-
vmImage: 'ubuntu-18.04'
9+
vmImage: 'ubuntu-16.04'
1010
python.version: '3.7'
1111
Linux_py38:
12-
vmImage: 'ubuntu-18.04'
12+
vmImage: 'ubuntu-16.04'
1313
python.version: '3.8'
1414
Linux_py39:
15-
vmImage: 'ubuntu-18.04'
15+
vmImage: 'ubuntu-16.04'
1616
python.version: '3.9'
1717
macOS_py37:
1818
vmImage: 'macOS-10.15'

‎doc/_static/matplotlib-icon.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
0