Support pyparsing version 3 (#907)

* * Change pyparsing usage to be compatible with version 3 upcaseTokens -> pyparsing_common.upcaseTokens * Spec minimum pyparsing in the conda package * syntax fix Co-authored-by: AU <adam-urbanczyk@users.noreply.github.com>
CadQuery · Oct 30, 2021 · bc6bf9e · bc6bf9e
1 parent 9fe1a2b
commit bc6bf9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cadquery/selectors.py b/cadquery/selectors.py
@@ -31,13 +31,13 @@
     geom_LUT_FACE,
 )
 from pyparsing import (
+    pyparsing_common,
     Literal,
     Word,
     nums,
     Optional,
     Combine,
     oneOf,
-    upcaseTokens,
     CaselessLiteral,
     Group,
     infixNotation,
@@ -637,7 +637,7 @@ def _makeGrammar():
     cqtype = oneOf(
         set(geom_LUT_EDGE.values()) | set(geom_LUT_FACE.values()), caseless=True,
     )
-    cqtype = cqtype.setParseAction(upcaseTokens)
+    cqtype = cqtype.setParseAction(pyparsing_common.upcaseTokens)
 
     # type operator
     type_op = Literal("%")

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -17,7 +17,7 @@ requirements:
     - python {{ environ.get('PYTHON_VERSION') }}
     - ocp 7.5.2
     - hdf5 1.10.6 *1114
-    - pyparsing 2.*
+    - pyparsing >=2.1.9
     - ezdxf
     - ipython
     - typing_extensions

diff --git a/environment.yml b/environment.yml
@@ -7,7 +7,7 @@ dependencies:
   - python>=3.6
   - ipython
   - ocp=7.5.1
-  - pyparsing
+  - pyparsing>=2.1.9
   - sphinx=3.2.1
   - sphinx_rtd_theme
   - sphinx-autodoc-typehints