MNT: Unpin pyparsing, xfail error message tests for pyparsing 3.1.0

ksunden · ksunden · commit f677db7660f4 · 2023-08-01T11:24:38.000-05:00
May require backporting a portion of #26198 to the 3.7 branch if we wish to have a 3.7.3. (specifically the part where token, placeable, and auto_delim are excluded from )
diff --git 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
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -9,13 +9,18 @@
 from typing import Any
 
 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 = [
@@ -279,6 +284,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',
     [
diff --git a/setup.py b/setup.py
@@ -335,7 +335,7 @@ def make_release_tree(self, base_dir, files):
         "numpy>=1.21",
         "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.
