Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commite16f62d

Browse files
committed
resolve conflicts
2 parents035403a +ff0497c commite16f62d

File tree

253 files changed

+2219
-1190
lines changed

Some content is hidden

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

253 files changed

+2219
-1190
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ artifacts:
9494

9595
on_finish:
9696
-conda install codecov
97-
-codecov -e PYTHON_VERSION PLATFORM
97+
-codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
9898

9999
on_failure:
100100
# Generate a html for visual tests

‎.circleci/config.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Circle CI configuration file
22
# https://circleci.com/docs/
3-
3+
---
44
version:2.1
55

66

@@ -199,6 +199,12 @@ commands:
199199
-store_artifacts:
200200
path:doc/build/sphinx-gallery-files.tar.gz
201201

202+
deploy-docs:
203+
steps:
204+
-run:
205+
name:"Deploy new docs"
206+
command:./.circleci/deploy-docs.sh
207+
202208

203209
##########################################
204210
# Here is where the real jobs are defined.
@@ -236,9 +242,7 @@ jobs:
236242
fingerprints:
237243
-"be:c3:c1:d8:fb:a1:0e:37:71:72:d7:a3:40:13:8f:14"
238244

239-
-deploy:
240-
name:"Deploy new docs"
241-
command:./.circleci/deploy-docs.sh
245+
-deploy-docs
242246

243247
#########################################
244248
# Defining workflows gets us parallelism.

‎.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ per-file-ignores =
6363
galleries/users_explain/text/text_props.py: E501
6464

6565
galleries/examples/animation/frame_grabbing_sgskip.py: E402
66+
galleries/examples/color/individual_colors_from_cmap.py: E402
6667
galleries/examples/images_contours_and_fields/tricontour_demo.py: E201
6768
galleries/examples/images_contours_and_fields/tripcolor_demo.py: E201
6869
galleries/examples/images_contours_and_fields/triplot_demo.py: E201

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ out the development guide https://matplotlib.org/devdocs/devel/index.html
77
<!-- Please provide at least 1-2 sentences describing the pull request in detail
88
(Why is this change required? What problem does it solve?) and link to relevant
99
issues and PRs.
10+
1011
Also please summarize the changes in the title, for example "Raise ValueError on
1112
non-numeric input to set_xlim" and avoid non-descriptive titles such as "Addresses
1213
issue #8576".
1314
-->
15+
16+
1417
##PR checklist
1518
<!-- Please mark any checkboxes that do not apply to this PR as [N/A].-->
1619

1720
-[ ] "closes#0000" is in the body of the PR description to[link the related issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
1821
-[ ] new and changed code is[tested](https://matplotlib.org/devdocs/devel/testing.html)
1922
-[ ]*Plotting related* features are demonstrated in an[example](https://matplotlib.org/devdocs/devel/document.html#write-examples-and-tutorials)
20-
-[ ]*New Features* and*API Changes* are noted with a[directive and release note](https://matplotlib.org/devdocs/devel/coding_guide.html#new-features-and-api-changes)
23+
-[ ]*New Features* and*API Changes* are noted with a[directive and release note](https://matplotlib.org/devdocs/devel/api_changes.html#announce-changes-deprecations-and-new-features)
2124
-[ ] Documentation complies with[general](https://matplotlib.org/devdocs/devel/document.html#write-rest-pages) and[docstring](https://matplotlib.org/devdocs/devel/document.html#write-docstrings) guidelines
2225

2326
<!--We understand that PRs can sometimes be overwhelming, especially as the

‎.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ updates:
44
directory:"/"
55
schedule:
66
interval:"weekly"
7+
groups:
8+
actions:
9+
patterns:
10+
-"*"

‎.github/labeler.yml

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
---
2+
"CI: Run cibuildwheel":
3+
-changed-files:
4+
-any-glob-to-any-file:['.github/workflows/cibuildwheel.yml']
5+
"CI: Run cygwin":
6+
-changed-files:
7+
-any-glob-to-any-file:['.github/workflows/cygwin.yml']
8+
9+
"backend: agg":
10+
-changed-files:
11+
-any-glob-to-any-file:
12+
-'extern/agg24-svn/'
13+
-'lib/matplotlib/backends/_backend_agg.pyi'
14+
-'lib/matplotlib/backends/backend_agg.py*'
15+
-'src/_backend_agg*'
16+
"backend: cairo":
17+
-changed-files:
18+
-any-glob-to-any-file:
19+
-'lib/matplotlib/backends/backend_*cairo.py*'
20+
"backend: pdf":
21+
-changed-files:
22+
-any-glob-to-any-file:
23+
-'lib/matplotlib/backends/_backend_pdf_ps.py'
24+
-'lib/matplotlib/backends/backend_pdf.py'
25+
"backend: pgf":
26+
-changed-files:
27+
-any-glob-to-any-file:
28+
-'lib/matplotlib/backends/backend_pgf.py'
29+
"backend: ps":
30+
-changed-files:
31+
-any-glob-to-any-file:
32+
-'lib/matplotlib/backends/_backend_pdf_ps.py'
33+
-'lib/matplotlib/backends/backend_ps.py'
34+
"backend: svg":
35+
-changed-files:
36+
-any-glob-to-any-file:
37+
-'lib/matplotlib/backends/backend_svg.py'
38+
39+
"GUI: gtk":
40+
-changed-files:
41+
-any-glob-to-any-file:
42+
-'lib/matplotlib/backends/_backend_gtk.py*'
43+
-'lib/matplotlib/backends/backend_gtk*'
44+
"GUI: MacOSX":
45+
-changed-files:
46+
-any-glob-to-any-file:
47+
-'lib/matplotlib/backends/*_macosx.py*'
48+
-'src/_macosx.m'
49+
"GUI: nbagg":
50+
-changed-files:
51+
-any-glob-to-any-file:
52+
-'lib/matplotlib/backends/*_nbagg*.py*'
53+
-'lib/matplotlib/backends/web_backend/js/nbagg_mpl.js'
54+
"GUI: Qt":
55+
-changed-files:
56+
-any-glob-to-any-file:
57+
-'lib/matplotlib/backends/backend_qt*'
58+
-'lib/matplotlib/backends/qt_compat.py'
59+
-'lib/matplotlib/backends/qt_editor/**'
60+
"GUI: tk":
61+
-changed-files:
62+
-any-glob-to-any-file:
63+
-'lib/matplotlib/backends/*backend_tk*'
64+
-'lib/matplotlib/backends/_tkagg.pyi'
65+
-'src/_tkagg.cpp'
66+
-'src/_tkmini.h'
67+
"GUI: webagg":
68+
-changed-files:
69+
-any-glob-to-any-file:
70+
-'lib/matplotlib/backends/*_webagg*.py*'
71+
-'lib/matplotlib/backends/web_backend/**'
72+
"GUI: wx":
73+
-changed-files:
74+
-any-glob-to-any-file:
75+
-'lib/matplotlib/backends/backend_wx*.py*'
76+
77+
"Documentation: API":
78+
-all:
79+
-changed-files:
80+
-any-glob-to-any-file:
81+
# Also files in lib/**, but we can't be sure those are only documentation.
82+
-'doc/api/**'
83+
-all-globs-to-all-files:
84+
-'!doc/api/next_api_changes/**'
85+
86+
"Documentation: build":
87+
-changed-files:
88+
-any-glob-to-any-file:
89+
-'doc/conf.py'
90+
-'doc/Makefile'
91+
-'doc/make.bat'
92+
"Documentation: devdocs":
93+
-changed-files:
94+
-any-glob-to-any-file:
95+
-'doc/devel/**'
96+
"Documentation: examples":
97+
-changed-files:
98+
-any-glob-to-any-file:
99+
-'galleries/examples/**'
100+
"Documentation: plot types":
101+
-changed-files:
102+
-any-glob-to-any-file:
103+
-'galleries/plot_types/**'
104+
"Documentation: tutorials":
105+
-changed-files:
106+
-any-glob-to-any-file:
107+
-'galleries/tutorials/**'
108+
"Documentation: user guide":
109+
-all:
110+
-changed-files:
111+
-any-glob-to-any-file:
112+
-'doc/users/**'
113+
-'galleries/users_explain/**'
114+
-all-globs-to-all-files:
115+
-'!doc/users/next_whats_new/**'
116+
117+
"topic: animation":
118+
-changed-files:
119+
-any-glob-to-any-file:
120+
-'lib/matplotlib/animation.py*'
121+
-'lib/matplotlib/_animation_data.py*'
122+
"topic: axes":
123+
-changed-files:
124+
-any-glob-to-any-file:
125+
# Note, axes.py is not included here because it contains many plotting
126+
# methods, for which changes would not be considered on topic.
127+
-'lib/matplotlib/axes/_base.py*'
128+
"topic: canvas and figure manager":
129+
-changed-files:
130+
-any-glob-to-any-file:
131+
-'lib/matplotlib/backend_bases.py*'
132+
"topic: categorical":
133+
-changed-files:
134+
-any-glob-to-any-file:
135+
-'lib/matplotlib/category.py*'
136+
"topic: collections and mappables":
137+
-changed-files:
138+
-any-glob-to-any-file:
139+
-'lib/matplotlib/collections.py*'
140+
"topic: color/color & colormaps":
141+
-changed-files:
142+
-any-glob-to-any-file:
143+
-'lib/matplotlib/colorbar.py*'
144+
-'lib/matplotlib/colors.py*'
145+
-'lib/matplotlib/_color_data.py*'
146+
-'lib/matplotlib/cm.py*'
147+
-'lib/matplotlib/_cm.py*'
148+
-'lib/matplotlib/_cm_listed.py*'
149+
"topic: contour":
150+
-changed-files:
151+
-any-glob-to-any-file:
152+
-'lib/matplotlib/contour.py*'
153+
-'src/_qhull_wrapper.cpp'
154+
"topic: date handling":
155+
-changed-files:
156+
-any-glob-to-any-file:
157+
-'lib/matplotlib/dates.py*'
158+
"topic: figures and subfigures":
159+
-changed-files:
160+
-any-glob-to-any-file:
161+
-'lib/matplotlib/figure.py*'
162+
"topic: geometry manager":
163+
-changed-files:
164+
-any-glob-to-any-file:
165+
-'lib/matplotlib/_constrained_layout.py*'
166+
-'lib/matplotlib/_layoutgrid.py*'
167+
-'lib/matplotlib/_tight_bbox.py*'
168+
-'lib/matplotlib/_tight_layout.py*'
169+
-'lib/matplotlib/gridspec.py*'
170+
-'lib/matplotlib/layout_engine.py*'
171+
"topic: hatch":
172+
-changed-files:
173+
-any-glob-to-any-file:
174+
-'lib/matplotlib/hatch.py*'
175+
"topic: images":
176+
-changed-files:
177+
-any-glob-to-any-file:
178+
-'lib/matplotlib/image.py*'
179+
-'lib/matplotlib/_image.pyi'
180+
-'src/_image_*'
181+
"topic: legend":
182+
-changed-files:
183+
-any-glob-to-any-file:
184+
-'lib/matplotlib/legend.py*'
185+
-'lib/matplotlib/legend_handler.py*'
186+
"topic: markers":
187+
-changed-files:
188+
-any-glob-to-any-file:
189+
-'lib/matplotlib/markers.py*'
190+
"topic: mpl_toolkit":
191+
-all:
192+
-changed-files:
193+
-any-glob-to-any-file:
194+
-'lib/mpl_toolkits/**'
195+
-all-globs-to-all-files:
196+
-'!lib/mpl_toolkits/mplot3d/**'
197+
"topic: mplot3d":
198+
-changed-files:
199+
-any-glob-to-any-file:
200+
-'lib/mpl_toolkits/mplot3d/**'
201+
"topic: path handling":
202+
-changed-files:
203+
-any-glob-to-any-file:
204+
-'lib/matplotlib/path.py*'
205+
-'lib/matplotlib/patheffects.py*'
206+
-'lib/matplotlib/_path.pyi'
207+
-'src/*path*'
208+
"topic: polar":
209+
-changed-files:
210+
-any-glob-to-any-file:
211+
-'lib/matplotlib/projections/polar.py*'
212+
"topic: pyplot API":
213+
-changed-files:
214+
-any-glob-to-any-file:
215+
-'lib/matplotlib/pyplot.py'
216+
-'lib/matplotlib/_pylab_helpers.py*'
217+
"topic: rcparams":
218+
-changed-files:
219+
-any-glob-to-any-file:
220+
-'lib/matplotlib/rcsetup.py*'
221+
"topic: sankey":
222+
-changed-files:
223+
-any-glob-to-any-file:
224+
-'lib/matplotlib/sankey.py*'
225+
"topic: sphinx extension":
226+
-changed-files:
227+
-any-glob-to-any-file:
228+
-'lib/matplotlib/sphinxext/**'
229+
"topic: styles":
230+
-changed-files:
231+
-any-glob-to-any-file:
232+
-'lib/matplotlib/mpl-data/stylelib/**'
233+
-'lib/matplotlib/style/**'
234+
"topic: table":
235+
-changed-files:
236+
-any-glob-to-any-file:
237+
-'lib/matplotlib/table.py*'
238+
"topic: text":
239+
-changed-files:
240+
-any-glob-to-any-file:
241+
-'lib/matplotlib/text.py*'
242+
-'lib/matplotlib/textpath.py*'
243+
"topic: text/fonts":
244+
-changed-files:
245+
-any-glob-to-any-file:
246+
-'src/checkdep_freetype2.c'
247+
-'src/ft2font*'
248+
"topic: text/mathtext":
249+
-changed-files:
250+
-any-glob-to-any-file:
251+
-'lib/matplotlib/mathtext.py*'
252+
-'lib/matplotlib/_mathtext.py*'
253+
-'lib/matplotlib/_mathtext_data.py*'
254+
"topic: ticks axis labels":
255+
-changed-files:
256+
-any-glob-to-any-file:
257+
-'lib/matplotlib/axis.py*'
258+
-'lib/matplotlib/ticker.py*'
259+
"topic: toolbar":
260+
-changed-files:
261+
-any-glob-to-any-file:
262+
-'lib/matplotlib/backend_managers.py*'
263+
-'lib/matplotlib/backend_tools.py*'
264+
"topic: transforms and scales":
265+
-changed-files:
266+
-any-glob-to-any-file:
267+
-'lib/matplotlib/scale.py*'
268+
-'lib/matplotlib/transforms.py*'
269+
"topic: tri":
270+
-changed-files:
271+
-any-glob-to-any-file:
272+
-'lib/matplotlib/tri/**'
273+
-'src/tri/**'
274+
"topic: units and array ducktypes":
275+
-changed-files:
276+
-any-glob-to-any-file:
277+
-'lib/matplotlib/units.py*'
278+
"topic: widgets/UI":
279+
-changed-files:
280+
-any-glob-to-any-file:
281+
-'lib/matplotlib/widgets.py*'

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp