8000 Expire deprecation of mathcircled. · matplotlib/matplotlib@deb0907 · GitHub
[go: up one dir, main page]
Skip to content

Commit deb0907

Browse files
anntzeranntzer
committed
Expire deprecation of mathcircled.
... without reindexing later baseline images yet, so that git rename detection works(?)
1 parent 9c4e686 commit deb0907

Some content is hidden

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

48 files changed

+7
-14
lines changed

‎doc/api/next_api_changes/removals.rst

Lines changed: 5 additions & 0 deletions

‎lib/matplotlib/mathtext.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,8 +2299,7 @@ class Parser:
22992299

23002300
_dropsub_symbols = set(r'''\int \oint'''.split())
23012301

2302-
_fontnames = set(
2303-
"rm cal it tt sf bf default bb frak circled scr regular".split())
2302+
_fontnames = set("rm cal it tt sf bf default bb frak scr regular".split())
23042303

23052304
_function_names = set("""
23062305
arccos csc ker min arcsin deg lg Pr arctan det lim sec arg dim
@@ -2618,11 +2617,6 @@ def font(self):
26182617

26192618
@font.setter
26202619
def font(self, name):
2621-
if name == "circled":
2622-
cbook.warn_deprecated(
2623-
"3.1", name="\\mathcircled", obj_type="mathtext command",
2624-
alternative="unicode characters (e.g. '\\N{CIRCLED LATIN "
2625-
"CAPITAL LETTER A}' or '\\u24b6')")
26262620
if name in ('rm', 'it', 'bf'):
26272621
self.font_class = name
26282622
self._font = name

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_23.png

-3.79 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_24.png

-6.22 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_25.png

-5.39 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_26.png

-3.91 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_27.png

-6.16 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_28.png

-5.5 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_29.png

-4.35 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_30.png

-6.68 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_31.png

-5.83 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_23.png

-3.79 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_24.png

-6.22 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_25.png

-5.39 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_26.png

-3.91 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_27.png

-6.16 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_28.png

-5.5 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_29.png

-4.35 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_30.png

-6.68 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavusans_31.png

-5.83 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_23.png

-3.79 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_24.png

-6.22 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_25.png

-5.39 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_26.png

-3.91 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_27.png

-6.16 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_28.png

-5.5 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_29.png

-4.35 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_30.png

-6.68 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_dejavuserif_31.png

-5.83 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_23.png

-3.79 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_24.png

-6.22 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_25.png

-5.39 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_26.png

-3.91 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_27.png

-6.16 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_28.png

-5.5 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_29.png

-4.35 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_30.png

-6.68 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_31.png

-5.83 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_23.png

-3.79 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_24.png

-6.22 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_25.png

-5.39 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_26.png

-3.91 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_27.png

-6.16 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_28.png

-5.5 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_29.png

-4.35 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_30.png

-6.68 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_31.png

-5.83 KB
Binary file not shown.

‎lib/matplotlib/tests/test_mathtext.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@
125125
(['mathbf'], all),
126126
(['mathit'], all),
127127
(['mathtt'], [digits, uppercase, lowercase]),
128-
(['mathcircled'], [digits, uppercase, lowercase]),
129-
(['mathrm', 'mathcircled'], [digits, uppercase, lowercase]),
130-
(['mathbf', 'mathcircled'], [digits, uppercase, lowercase]),
131128
(['mathbb'], [digits, uppercase, lowercase,
132129
r'\Gamma \Pi \Sigma \gamma \pi']),
133130
(['mathrm', 'mathbb'], [digits, uppercase, lowercase,
@@ -162,10 +159,6 @@ def baseline_images(request, fontset, index):
162159
return ['%s_%s_%02d' % (request.param, fontset, index)]
163160

164161

165-
# In the following two tests, use recwarn to suppress warnings regarding the
166-
# deprecation of \stackrel and \mathcircled.
167-
168-
169162
@pytest.mark.parametrize('index, test', enumerate(math_tests),
170163
ids=[str(index) for index in range(len(math_tests))])
171164
@pytest.mark.parametrize('fontset',
@@ -180,6 +173,7 @@ def test_mathtext_rendering(baseline_images, fontset, index, test, recwarn):
180173
horizontalalignment='center', verticalalignment='center')
181174

182175

176+
# recwarn suppresses warnings regarding the deprecation of \stackrel.
183177
@pytest.mark.parametrize('index, test', enumerate(font_tests),
184178
ids=[str(index) for index in range(len(font_tests))])
185179
@pytest.mark.parametrize('fontset',

0 commit comments

Comments
 (0)
0