From 474ae890eaf65086b91eeeff38e1f2ce4ebcd53c Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 20 Jun 2023 15:16:30 -0400 Subject: [PATCH] Backport PR #26153: Restrict pyparsing version --- .github/workflows/tests.yml | 2 +- environment.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8b92e156451f..8be6bb46eb61 100644 --- 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 index 8035e75ea9d3..8ea65e251bc1 100644 --- 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 index 490850ad6203..0bea13fa6f87 100644 --- 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.