1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
https://bugs.gentoo.org/911127
https://github.com/matplotlib/matplotlib/issues/26152
https://github.com/matplotlib/matplotlib/pull/26432
From c5183789d7d0cd151c201eeb2ce4fc786b6e43c2 Mon Sep 17 00:00:00 2001
From: Jody Klymak <jklymak@gmail.com>
Date: Tue, 1 Aug 2023 13:41:44 -0700
Subject: [PATCH 1/2] Backport PR #26431: MNT: Unpin pyparsing, xfail error
message tests for pyparsing 3.1.0
--- a/environment.yml
+++ b/environment.yml
@@ -19,7 +19,7 @@ dependencies:
- pillow>=6.2
- pybind11>=2.6.0
- pygobject
- - pyparsing!=3.1.0
+ - pyparsing>=2.3.1
- pyqt
- python-dateutil>=2.1
- setuptools
--- a/lib/matplotlib/tests/test_mathtext.py
+++ b/lib/matplotlib/tests/test_mathtext.py
@@ -6,13 +6,18 @@
from xml.etree import ElementTree as ET
import numpy as np
+from packaging.version import parse as parse_version
+import pyparsing
import pytest
+
import matplotlib as mpl
from matplotlib.testing.decorators import check_figures_equal, image_comparison
import matplotlib.pyplot as plt
from matplotlib import mathtext, _mathtext
+pyparsing_version = parse_version(pyparsing.__version__)
+
# If test is removed, use None as placeholder
math_tests = [
@@ -270,6 +275,9 @@ def test_fontinfo():
assert table['version'] == (1, 0)
+# See gh-26152 for more context on this xfail
+@pytest.mark.xfail(pyparsing_version.release == (3, 1, 0),
+ reason="Error messages are incorrect for this version")
@pytest.mark.parametrize(
'math, msg',
[
--- a/lib/matplotlib/tests/test_text.py
+++ b/lib/matplotlib/tests/test_text.py
@@ -4,6 +4,8 @@
import numpy as np
from numpy.testing import assert_almost_equal
+from packaging.version import parse as parse_version
+import pyparsing
import pytest
import matplotlib as mpl
@@ -16,6 +18,8 @@
from matplotlib.testing._markers import needs_usetex
from matplotlib.text import Text
+pyparsing_version = parse_version(pyparsing.__version__)
+
@image_comparison(['font_styles'])
def test_font_styles():
@@ -809,6 +813,9 @@ def test_unsupported_script(recwarn):
(r"Matplotlib currently does not support Bengali natively.",)])
+# See gh-26152 for more information on this xfail
+@pytest.mark.xfail(pyparsing_version.release == (3, 1, 0),
+ reason="Error messages are incorrect with pyparsing 3.1.0")
def test_parse_math():
fig, ax = plt.subplots()
ax.text(0, 0, r"$ \wrong{math} $", parse_math=False)
@@ -819,6 +826,9 @@ def test_parse_math():
fig.canvas.draw()
+# See gh-26152 for more information on this xfail
+@pytest.mark.xfail(pyparsing_version.release == (3, 1, 0),
+ reason="Error messages are incorrect with pyparsing 3.1.0")
def test_parse_math_rcparams():
# Default is True
fig, ax = plt.subplots()
--- a/setup.py
+++ b/setup.py
@@ -325,7 +325,7 @@ def make_release_tree(self, base_dir, files):
"numpy>=1.20",
"packaging>=20.0",
"pillow>=6.2.0",
- "pyparsing>=2.3.1,<3.1",
+ "pyparsing>=2.3.1",
"python-dateutil>=2.7",
] + (
# Installing from a git checkout that is not producing a wheel.
From 7f475c5088a826adffac2885d027d4f8b3cba218 Mon Sep 17 00:00:00 2001
From: Kyle Sunden <git@ksunden.space>
Date: Mon, 26 Jun 2023 22:17:27 -0500
Subject: [PATCH 2/2] Manual backport of #26198
Cherry picked and fixed up, ignored changes to the pyi file (which doesn't exist on this branch).
--- a/lib/matplotlib/_mathtext.py
+++ b/lib/matplotlib/_mathtext.py
@@ -1802,8 +1802,11 @@ def __init__(self):
def set_names_and_parse_actions():
for key, val in vars(p).items():
if not key.startswith('_'):
- # Set names on everything -- very useful for debugging
- val.setName(key)
+ # Set names on (almost) everything -- very useful for debugging
+ # token, placeable, and auto_delim are forward references which
+ # are left without names to ensure useful error messages
+ if key not in ("token", "placeable", "auto_delim"):
+ val.setName(key)
# Set actions
if hasattr(self, key):
val.setParseAction(getattr(self, key))
@@ -1840,63 +1843,39 @@ def csnames(group, names):
p.unknown_symbol = Regex(r"\\[A-Za-z]*")("name")
p.font = csnames("font", self._fontnames)
- p.start_group = (
- Optional(r"\math" + oneOf(self._fontnames)("font")) + "{")
+ p.start_group = Optional(r"\math" + oneOf(self._fontnames)("font")) + "{"
p.end_group = Literal("}")
p.delim = oneOf(self._delims)
- set_names_and_parse_actions() # for root definitions.
-
# Mutually recursive definitions. (Minimizing the number of Forward
# elements is important for speed.)
- p.accent = Forward()
p.auto_delim = Forward()
- p.binom = Forward()
- p.customspace = Forward()
- p.frac = Forward()
- p.dfrac = Forward()
- p.function = Forward()
- p.genfrac = Forward()
- p.group = Forward()
- p.operatorname = Forward()
- p.overline = Forward()
- p.overset = Forward()
p.placeable = Forward()
p.required_group = Forward()
- p.simple = Forward()
p.optional_group = Forward()
- p.sqrt = Forward()
- p.subsuper = Forward()
p.token = Forward()
- p.underset = Forward()
set_names_and_parse_actions() # for mutually recursive definitions.
- p.customspace <<= cmd(r"\hspace", "{" + p.float_literal("space") + "}")
+ p.optional_group <<= "{" + ZeroOrMore(p.token)("group") + "}"
+ p.required_group <<= "{" + OneOrMore(p.token)("group") + "}"
- p.accent <<= (
+ p.customspace = cmd(r"\hspace", "{" + p.float_literal("space") + "}")
+
+ p.accent = (
csnames("accent", [*self._accent_map, *self._wide_accents])
- p.placeable("sym"))
- p.function <<= csnames("name", self._function_names)
- p.operatorname <<= cmd(
- r"\operatorname",
- "{" + ZeroOrMore(p.simple | p.unknown_symbol)("name") + "}")
+ p.function = csnames("name", self._function_names)
- p.group <<= p.start_group + ZeroOrMore(p.token)("group") + p.end_group
+ p.group = p.start_group + ZeroOrMore(p.token)("group") + p.end_group
- p.optional_group <<= "{" + ZeroOrMore(p.token)("group") + "}"
- p.required_group <<= "{" + OneOrMore(p.token)("group") + "}"
-
- p.frac <<= cmd(
- r"\frac", p.required_group("num") + p.required_group("den"))
- p.dfrac <<= cmd(
- r"\dfrac", p.required_group("num") + p.required_group("den"))
- p.binom <<= cmd(
- r"\binom", p.required_group("num") + p.required_group("den"))
+ p.frac = cmd(r"\frac", p.required_group("num") + p.required_group("den"))
+ p.dfrac = cmd(r"\dfrac", p.required_group("num") + p.required_group("den"))
+ p.binom = cmd(r"\binom", p.required_group("num") + p.required_group("den"))
- p.genfrac <<= cmd(
+ p.genfrac = cmd(
r"\genfrac",
"{" + Optional(p.delim)("ldelim") + "}"
+ "{" + Optional(p.delim)("rdelim") + "}"
@@ -1905,20 +1884,38 @@ def csnames(group, names):
+ p.required_group("num")
+ p.required_group("den"))
- p.sqrt <<= cmd(
+ p.sqrt = cmd(
r"\sqrt{value}",
Optional("[" + OneOrMore(NotAny("]") + p.token)("root") + "]")
+ p.required_group("value"))
- p.overline <<= cmd(r"\overline", p.required_group("body"))
+ p.overline = cmd(r"\overline", p.required_group("body"))
- p.overset <<= cmd(
+ p.overset = cmd(
r"\overset",
p.optional_group("annotation") + p.optional_group("body"))
- p.underset <<= cmd(
+ p.underset = cmd(
r"\underset",
p.optional_group("annotation") + p.optional_group("body"))
+ p.subsuper = (
+ (Optional(p.placeable)("nucleus")
+ + OneOrMore(oneOf(["_", "^"]) - p.placeable)("subsuper")
+ + Regex("'*")("apostrophes"))
+ | Regex("'+")("apostrophes")
+ | (p.placeable("nucleus") + Regex("'*")("apostrophes"))
+ )
+
+ p.simple = p.space | p.customspace | p.font | p.subsuper
+
+ p.token <<= (
+ p.simple
+ | p.auto_delim
+ | p.unknown_symbol # Must be last
+ )
+
+ p.operatorname = cmd(r"\operatorname", "{" + ZeroOrMore(p.simple)("name") + "}")
+
p.placeable <<= (
p.accent # Must be before symbol as all accents are symbols
| p.symbol # Must be second to catch all named symbols and single
@@ -1936,27 +1933,6 @@ def csnames(group, names):
| p.overline
)
- p.simple <<= (
- p.space
- | p.customspace
- | p.font
- | p.subsuper
- )
-
- p.subsuper <<= (
- (Optional(p.placeable)("nucleus")
- + OneOrMore(oneOf(["_", "^"]) - p.placeable)("subsuper")
- + Regex("'*")("apostrophes"))
- | Regex("'+")("apostrophes")
- | (p.placeable("nucleus") + Regex("'*")("apostrophes"))
- )
-
- p.token <<= (
- p.simple
- | p.auto_delim
- | p.unknown_symbol # Must be last
- )
-
p.auto_delim <<= (
r"\left" - (p.delim("left") | Error("Expected a delimiter"))
+ ZeroOrMore(p.simple | p.auto_delim)("mid")
|
