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

Commitd043343

Browse files
Revert "Merge branch 'wxtoolmanager' ofhttps://github.com/DietmarSchwertberger/matplotlib into wxtoolmanager"
1 parentfd1e12b commitd043343

File tree

60 files changed

+598
-687
lines changed

Some content is hidden

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

60 files changed

+598
-687
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ env:
4747
-ARTIFACTS_BUCKET=matplotlib-test-results
4848
-secure:RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
4949
-secure:E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
50-
-secure:dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU=
50+
-secure:"dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
5151
# Variables controlling Python dependencies.
5252
-CYCLER=cycler
5353
-DATEUTIL=python-dateutil
@@ -156,7 +156,7 @@ install:
156156
python -c 'import pgi as gi; gi.require_version("Gtk", "3.0"); from pgi.repository import Gtk' &&
157157
echo 'pgi is available' ||
158158
echo 'pgi is not available'
159-
python -mpip install pyqt5 &&
159+
python -mpip install pyqt5==5.9 &&
160160
python -c 'import PyQt5.QtCore' &&
161161
echo 'PyQt5 is available' ||
162162
echo 'PyQt5 is not available'

‎doc-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Install the documentation requirements with:
77
# pip install -r doc-requirements.txt
88
#
9-
sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3
9+
sphinx>=1.3,!=1.5.0,!=1.6.4
1010
colorspacious
1111
ipython
1212
ipywidgets

‎doc/_static/mpl.css

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -768,26 +768,6 @@ figcaption {
768768
text-align: center;
769769
}
770770

771-
772-
/* "Summer Fellowship" message. */
773-
#summer-fellowship {
774-
background:#11557C;
775-
box-sizing: border-box;
776-
color:#fffa;
777-
font-weight: bold;
778-
left:0;
779-
min-height:3em;
780-
padding:0.5em;
781-
top:0;
782-
width:100%;
783-
z-index:10000;
784-
}
785-
786-
#summer-fellowshipa {
787-
color:#fff;
788-
text-decoration:underline;
789-
}
790-
791771
/* "Go to released version" message. */
792772
#unreleased-message {
793773
background:#d62728;

‎doc/_templates/layout.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ <h3>{{ _('Navigation') }}</h3>
172172
</a>
173173
</div>
174174
{%- endif %}
175-
<divid="summer-fellowship">
176-
Applications are open for the 2018 John Hunter Matplotlib Summer Fellowship.
177-
<ahref="https://www.numfocus.org/programs/john-hunter-technology-fellowship">
178-
Apply now!
179-
</a>
180-
</div>
181175
<divstyle="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
182176
{%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
183177
<ahref="{{ pathto('index') }}">

‎doc/api/next_api_changes/2018-02-15-AL-deprecations.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ The following classes, methods, functions, and attributes are deprecated:
1515
- ``backend_wx.FigureCanvasWx.macros``,
1616
- ``cbook.GetRealpathAndStat``, ``cbook.Locked``,
1717
- ``cbook.is_numlike`` (use ``isinstance(..., numbers.Number)`` instead),
18-
``cbook.listFiles``, ``cbook.unicode_safe``,
18+
``cbook.listFiles``, ``cbook.unicode_safe``
1919
- ``container.Container.set_remove_method``,
20-
- ``contour.ContourLabeler.cl``, ``.cl_xy``, and ``.cl_cvalues``,
2120
- ``dates.DateFormatter.strftime_pre_1900``, ``dates.DateFormatter.strftime``,
2221
- ``font_manager.TempCache``,
2322
- ``mathtext.unichr_safe`` (use ``chr`` instead),
24-
- ``table.Table.get_child_artists`` (use ``get_children`` instead),
2523
- ``testing.compare.ImageComparisonTest``, ``testing.compare.compare_float``,
2624
- ``testing.decorators.skip_if_command_unavailable``.
2725
- ``FigureCanvasQT.keyAutoRepeat`` (directly check

‎doc/api/next_api_changes/2018-04-20-AL.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-04-22-AL.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎doc/citing.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
2727
2828
DOIs
2929
----
30-
v2.2.2
31-
..image::https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
32-
:target:https://doi.org/10.5281/zenodo.1202077
33-
v2.2.1
34-
..image::https://zenodo.org/badge/DOI/10.5281/zenodo.1202050.svg
35-
:target:https://doi.org/10.5281/zenodo.1202050
3630
v2.2.0
3731
..image::https://zenodo.org/badge/DOI/10.5281/zenodo.1189358.svg
3832
:target:https://doi.org/10.5281/zenodo.1189358

‎doc/devel/coding_guide.rst

Lines changed: 21 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ Pull request checklist
1212
Branch selection
1313
----------------
1414

15-
In general target the master branch for all new features and
16-
bug-fixes. PRs may target maintenance or doc branches on
17-
a case-by-case basis.
15+
* In general, simple bugfixes that are unlikely to introduce new bugs
16+
of their own should be merged onto the maintenance branch. New
17+
features, or anything that changes the API, should be made against
18+
master. The rules are fuzzy here -- when in doubt, target master.
1819

20+
* Once changes are merged into the maintenance branch, they should
21+
be merged into master.
1922

2023
Documentation
2124
-------------
@@ -84,76 +87,31 @@ PR Review guidelines
8487
merge the PR and then open a new PR against upstream.
8588

8689

87-
Branches and Backports
88-
======================
89-
90-
91-
The current active branches are
92-
93-
*master*
94-
This will be Matplotlib 3.0. Supports Python 3.5+.
95-
96-
*v2.2.x*
97-
Maintenance branch for Matplotlib 2.2 LTS. Supports Python 2.7, 3.4+
98-
99-
*v2.2.N-doc*
100-
Documentation for the current release. On a patch release, this will be replaced
101-
by a properly named branch for the new release.
102-
103-
104-
We always will backport to 2.2.x
105-
106-
- critical bug fixes (segfault, failure to import, things that the
107-
user can not work around)
108-
- fixes for regressions against 2.0 or 2.1
90+
Backports
91+
=========
10992

110-
Everything else (regressions against 1.x versions, bugs/api
111-
inconsistencies the user can work around in their code) are on a
112-
case-by-case basis, should be low-risk, and need someone to advocate
113-
for and shepherd through the backport.
11493

115-
The only changes to be backported to 2.2.N-doc are changes to
116-
``doc``, ``examples``, or ``tutorials``. Any changes to
117-
``lib`` or ``src`` should not be backported to this branch.
94+
When doing backports please include the branch you backported the
95+
commit to along with the SHA in a comment on the original PR.
11896

119-
Automated backports
120-
-------------------
121-
122-
We use meeseeksdev bot to automatically backport merges to the correct
123-
maintenance branch base on the milestone. To work properly the
124-
milestone must be set before merging. If you have commit rights, the
125-
bot can also be manually triggered after a merge by leaving a message
126-
``@meeseeksdev backport to BRANCH`` on the PR. If there are conflicts
127-
meeseekdevs will inform you that the backport needs to be done
128-
manually.
129-
130-
The target branch is configured by putting ``on-merge: backport to
131-
TARGETBRANCH`` in the milestone description on it's own line.
132-
133-
If the bot is not working as expected, please report issues to
134-
`Meeseeksdev<https://github.com/MeeseeksBox/MeeseeksDev>`__.
135-
136-
137-
Manual backports
138-
----------------
139-
140-
When doing backports please copy the form used by meeseekdev,
141-
``Backport PR #XXXX: TITLE OF PR``. If you need to manually resolve
142-
conflicts make note of them and how you resolved them in the commit
143-
message.
144-
145-
We do a backport from master to v2.2.x assuming:
97+
We do a backport from master to v2.0.x assuming:
14698

14799
* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
148100

101+
* ``DANGER`` is a read/write remote branch of the matplotlib/matplotlib repo
102+
149103
The ``TARGET_SHA`` is the hash of the merge commit you would like to
150104
backport. This can be read off of the github PR page (in the UI with
151105
the merge notification) or through the git CLI tools.::
152106

153107
git fetch matplotlib
154-
git checkout v2.2.x
155-
git merge --ff-only matplotlib/v2.2.x
108+
git checkout v2.0.x
109+
git merge --ff-only matplotlib/v2.0.x
156110
git cherry-pick -m 1 TARGET_SHA
157-
# resolve conflicts and commit if required
111+
git log --graph --decorate # to look at it
112+
# local tests? (use your judgment)
113+
git push DANGER v2.0.x
114+
# leave a comment on PR noting sha of the resulting commit
115+
# from the cherry-pick + branch it was moved to
158116

159-
Use your discretion to push directly to upstream or to open a PR.
117+
These commands work on git 2.7.1.

‎doc/devel/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ The Matplotlib Developers' Guide
2020
gitwash/index.rst
2121
coding_guide.rst
2222
release_guide.rst
23-
min_dep_policy.rst
2423
MEP/index
2524

2625
..toctree::

‎doc/devel/min_dep_policy.rst

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎examples/api/radar_chart.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ def __init__(self, *args, **kwargs):
6464
# rotate plot such that the first axis is at the top
6565
self.set_theta_zero_location('N')
6666

67-
deffill(self,*args,closed=True,**kwargs):
67+
deffill(self,*args,**kwargs):
6868
"""Override fill so that line is closed by default"""
69+
closed=kwargs.pop('closed',True)
6970
returnsuper().fill(closed=closed,*args,**kwargs)
7071

7172
defplot(self,*args,**kwargs):

‎examples/api/scatter_piecharts.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
s3=np.abs(xy3).max()
3939

4040
fig,ax=plt.subplots()
41-
ax.scatter(range(3),range(3),marker=xy1,
41+
ax.scatter(range(3),range(3),marker=(xy1,0),
4242
s=s1**2*sizes,facecolor='blue')
43-
ax.scatter(range(3),range(3),marker=xy2,
43+
ax.scatter(range(3),range(3),marker=(xy2,0),
4444
s=s2**2*sizes,facecolor='green')
45-
ax.scatter(range(3),range(3),marker=xy3,
45+
ax.scatter(range(3),range(3),marker=(xy3,0),
4646
s=s3**2*sizes,facecolor='red')
4747

4848
plt.show()

‎examples/images_contours_and_fields/contour_demo.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@
9898
plt.setp(zc,linewidth=4)
9999

100100
ax.clabel(CS,levels[1::2],# label every second level
101-
inline=1,fmt='%1.1f',fontsize=14)
101+
inline=1,fmt='%1.1f',
102+
cmap='flag',fontsize=14)
102103

103104
# make a colorbar for the contour lines
104105
CB=fig.colorbar(CS,shrink=0.8,extend='both')

‎examples/scales/custom_scale.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MercatorLatitudeScale(mscale.ScaleBase):
4444
# scale.
4545
name='mercator'
4646

47-
def__init__(self,axis,*,thresh=np.deg2rad(85),**kwargs):
47+
def__init__(self,axis,**kwargs):
4848
"""
4949
Any keyword arguments passed to ``set_xscale`` and
5050
``set_yscale`` will be passed along to the scale's
@@ -53,7 +53,8 @@ def __init__(self, axis, *, thresh=np.deg2rad(85), **kwargs):
5353
thresh: The degree above which to crop the data.
5454
"""
5555
mscale.ScaleBase.__init__(self)
56-
ifthresh>=np.pi/2:
56+
thresh=kwargs.pop("thresh",np.radians(85))
57+
ifthresh>=np.pi/2.0:
5758
raiseValueError("thresh must be less than pi/2")
5859
self.thresh=thresh
5960

‎examples/subplots_axes_and_figures/custom_figure_class.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212

1313

1414
classMyFigure(Figure):
15-
def__init__(self,*args,figtitle='hi mom',**kwargs):
15+
def__init__(self,*args,**kwargs):
1616
"""
1717
custom kwarg figtitle is a figure title
1818
"""
19-
super().__init__(*args,**kwargs)
19+
figtitle=kwargs.pop('figtitle','hi mom')
20+
Figure.__init__(self,*args,**kwargs)
2021
self.text(0.5,0.95,figtitle,ha='center')
2122

2223

‎examples/text_labels_and_annotations/usetex_baseline_test.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,22 @@ class Axes(maxes.Axes):
2020
usetex=False in the same figure. It does not work in the ps backend.
2121
"""
2222

23-
def__init__(self,*args,usetex=False,preview=False,**kwargs):
24-
self.usetex=usetex
25-
self.preview=preview
26-
super().__init__(*args,**kwargs)
23+
def__init__(self,*kl,**kw):
24+
self.usetex=kw.pop("usetex","False")
25+
self.preview=kw.pop("preview","False")
26+
27+
maxes.Axes.__init__(self,*kl,**kw)
2728

2829
defdraw(self,renderer):
29-
withplt.rc_context({"text.usetex":self.usetex,
30-
"text.latex.preview":self.preview}):
31-
super().draw(renderer)
30+
usetex=plt.rcParams["text.usetex"]
31+
preview=plt.rcParams["text.latex.preview"]
32+
plt.rcParams["text.usetex"]=self.usetex
33+
plt.rcParams["text.latex.preview"]=self.preview
34+
35+
maxes.Axes.draw(self,renderer)
36+
37+
plt.rcParams["text.usetex"]=usetex
38+
plt.rcParams["text.latex.preview"]=preview
3239

3340

3441
subplot=maxes.subplot_class_factory(Axes)

‎examples/user_interfaces/toolmanager_sgskip.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ class GroupHideTool(ToolToggleBase):
5757
description='Show by gid'
5858
default_toggled=True
5959

60-
def__init__(self,*args,gid,**kwargs):
61-
self.gid=gid
62-
super().__init__(*args,**kwargs)
60+
def__init__(self,*args,**kwargs):
61+
self.gid=kwargs.pop('gid')
62+
ToolToggleBase.__init__(self,*args,**kwargs)
6363

6464
defenable(self,*args):
6565
self.set_lines_visibility(True)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp