| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,7 @@ dependencies: | |||
| 19 | 19 | - pillow>=6.2 | |
| 20 | 20 | - pybind11>=2.6.0 | |
| 21 | 21 | - pygobject | |
| 22 | - - pyparsing!=3.1.0 | ||
| 22 | + - pyparsing>=2.3.1 | ||
| 23 | 23 | - pyqt | |
| 24 | 24 | - python-dateutil>=2.1 | |
| 25 | 25 | - setuptools | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,13 +6,18 @@ | |||
| 6 | 6 | from xml.etree import ElementTree as ET | |
| 7 | 7 | ||
| 8 | 8 | import numpy as np | |
| 9 | + from packaging.version import parse as parse_version | ||
| 10 | + import pyparsing | ||
| 9 | 11 | import pytest | |
| 10 | 12 | ||
| 13 | + | ||
| 11 | 14 | import matplotlib as mpl | |
| 12 | 15 | from matplotlib.testing.decorators import check_figures_equal, image_comparison | |
| 13 | 16 | import matplotlib.pyplot as plt | |
| 14 | 17 | from matplotlib import mathtext, _mathtext | |
| 15 | 18 | ||
| 19 | + pyparsing_version = parse_version(pyparsing.__version__) | ||
| 20 | + | ||
| 16 | 21 | ||
| 17 | 22 | # If test is removed, use None as placeholder | |
| 18 | 23 | math_tests = [ | |
@@ -270,6 +275,9 @@ def test_fontinfo(): | |||
| 270 | 275 | assert table['version'] == (1, 0) | |
| 271 | 276 | ||
| 272 | 277 | ||
| 278 | + # See gh-26152 for more context on this xfail | ||
| 279 | + @pytest.mark.xfail(pyparsing_version.release == (3, 1, 0), | ||
| 280 | + reason="Error messages are incorrect for this version") | ||
| 273 | 281 | @pytest.mark.parametrize( | |
| 274 | 282 | 'math, msg', | |
| 275 | 283 | [ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,6 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | 5 | import numpy as np | |
| 6 | 6 | from numpy.testing import assert_almost_equal | |
| 7 | + from packaging.version import parse as parse_version | ||
| 8 | + import pyparsing | ||
| 7 | 9 | import pytest | |
| 8 | 10 | ||
| 9 | 11 | import matplotlib as mpl | |
@@ -16,6 +18,8 @@ | |||
| 16 | 18 | from matplotlib.testing._markers import needs_usetex | |
| 17 | 19 | from matplotlib.text import Text | |
| 18 | 20 | ||
| 21 | + pyparsing_version = parse_version(pyparsing.__version__) | ||
| 22 | + | ||
| 19 | 23 | ||
| 20 | 24 | @image_comparison(['font_styles']) | |
| 21 | 25 | def test_font_styles(): | |
@@ -809,6 +813,9 @@ def test_unsupported_script(recwarn): | |||
| 809 | 813 | (r"Matplotlib currently does not support Bengali natively.",)]) | |
| 810 | 814 | ||
| 811 | 815 | ||
| 816 | + # See gh-26152 for more information on this xfail | ||
| 817 | + @pytest.mark.xfail(pyparsing_version.release == (3, 1, 0), | ||
| 818 | + reason="Error messages are incorrect with pyparsing 3.1.0") | ||
| 812 | 819 | def test_parse_math(): | |
| 813 | 820 | fig, ax = plt.subplots() | |
| 814 | 821 | ax.text(0, 0, r"$ \wrong{math} $", parse_math=False) | |
@@ -819,6 +826,9 @@ def test_parse_math(): | |||
| 819 | 826 | fig.canvas.draw() | |
| 820 | 827 | ||
| 821 | 828 | ||
| 829 | + # See gh-26152 for more information on this xfail | ||
| 830 | + @pytest.mark.xfail(pyparsing_version.release == (3, 1, 0), | ||
| 831 | + reason="Error messages are incorrect with pyparsing 3.1.0") | ||
| 822 | 832 | def test_parse_math_rcparams(): | |
| 823 | 833 | # Default is True | |
| 824 | 834 | fig, ax = plt.subplots() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -325,7 +325,7 @@ def make_release_tree(self, base_dir, files): | |||
| 325 | 325 | "numpy>=1.20", | |
| 326 | 326 | "packaging>=20.0", | |
| 327 | 327 | "pillow>=6.2.0", | |
| 328 | - "pyparsing>=2.3.1,<3.1", | ||
| 328 | + "pyparsing>=2.3.1", | ||
| 329 | 329 | "python-dateutil>=2.7", | |
| 330 | 330 | ] + ( | |
| 331 | 331 | # Installing from a git checkout that is not producing a wheel. | |
| Back | FazBrowse Home | New Git URL |
0 commit comments