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

Commit720ac9a

Browse files
committed
Unpin pyparsing.
1 parent0853185 commit720ac9a

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

‎lib/matplotlib/_mathtext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,9 +2128,9 @@ def __init__(self):
21282128
p.subsuper<<= (
21292129
(Optional(p.placeable)("nucleus")
21302130
+OneOrMore(oneOf(["_","^"])-p.placeable)("subsuper")
2131-
+ZeroOrMore("'")("apostrophes"))
2132-
|OneOrMore("'")("apostrophes")
2133-
| (p.placeable("nucleus")+ZeroOrMore("'")("apostrophes"))
2131+
+Regex("'*")("apostrophes"))
2132+
|Regex("'+")("apostrophes")
2133+
| (p.placeable("nucleus")+Regex("'*")("apostrophes"))
21342134
)
21352135

21362136
p.token<<= (

‎lib/matplotlib/tests/test_mathtext.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,9 @@ def test_fontinfo():
250250
(r'$\leftF$',r'Expected a delimiter'),
251251
(r'$\rightF$',r'Unknown symbol: \rightF'),
252252
(r'$\left(\right$',r'Expected a delimiter'),
253-
(r'$\left($',r'Expected "\right"'),
253+
# PyParsing 2 uses double quotes, PyParsing 3 uses single quotes and an
254+
# extra backslash.
255+
(r'$\left($',re.compile(r'Expected ("|\'\\)\\right["\']')),
254256
(r'$\dfrac$',r'Expected \dfrac{num}{den}'),
255257
(r'$\dfrac{}{}$',r'Expected \dfrac{num}{den}'),
256258
(r'$\overset$',r'Expected \overset{annotation}{body}'),
@@ -281,8 +283,8 @@ def test_fontinfo():
281283
)
282284
deftest_mathtext_exceptions(math,msg):
283285
parser=mathtext.MathTextParser('agg')
284-
285-
withpytest.raises(ValueError,match=re.escape(msg)):
286+
match=re.escape(msg)ifisinstance(msg,str)elsemsg
287+
withpytest.raises(ValueError,match=match):
286288
parser.parse(math)
287289

288290

‎requirements/doc/doc-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ipython
1313
ipywidgets
1414
numpydoc>=0.8
1515
packaging>=20
16-
pyparsing<3.0.0
1716
mpl-sphinx-theme
1817
sphinxcontrib-svg2pdfconverter>=1.1.0
1918
sphinx-gallery>=0.10

‎requirements/testing/all.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
certifi
44
coverage
5-
pyparsing<3.0.0
65
pytest!=4.6.0,!=5.4.0
76
pytest-cov
87
pytest-rerunfailures

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def make_release_tree(self, base_dir, files):
319319
"numpy>=1.17",
320320
"packaging>=20.0",
321321
"pillow>=6.2.0",
322-
"pyparsing>=2.2.1,<3.0.0",
322+
"pyparsing>=2.2.1",
323323
"python-dateutil>=2.7",
324324
]+ (
325325
# Installing from a git checkout.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp