Merge pull request #26158 from meeseeksmachine/auto-backport-of-pr-26153-on-v3.7.x

QuLogic · web-flow · commit 1332c4738132 · 2023-06-20T18:08:50.000-04:00
Backport PR #26153 on branch v3.7.x (Restrict pyparsing version)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -185,7 +185,7 @@ jobs:
           # Install dependencies from PyPI.
           python -m pip install --upgrade $PRE \
             'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \
-            numpy packaging pillow pyparsing python-dateutil setuptools-scm \
+            numpy packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}
 
diff --git a/environment.yml b/environment.yml
@@ -19,7 +19,7 @@ dependencies:
   - pillow>=6.2
   - pybind11>=2.6.0
   - pygobject
-  - pyparsing
+  - pyparsing!=3.1.0
   - pyqt
   - python-dateutil>=2.1
   - setuptools
diff --git 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",
+        "pyparsing>=2.3.1,<3.1",
         "python-dateutil>=2.7",
     ] + (
         # Installing from a git checkout that is not producing a wheel.
