-
Notifications
You must be signed in to change notification settings - Fork 295
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support pyparsing version 3 #907
Conversation
upcaseTokens -> pyparsing_common.upcaseTokens
This PR is incomplete - could someone update the conda build dependencies to specify pyparsing version 2.1.9 and later? I've run the cadquery pytests with pyparsing versions (passing in all cases): Tests will fail with pyparsing 2.1.8 and earlier. |
Codecov Report
@@ Coverage Diff @@
## master #907 +/- ##
=======================================
Coverage 95.92% 95.92%
=======================================
Files 32 32
Lines 7825 7825
Branches 846 846
=======================================
Hits 7506 7506
Misses 186 186
Partials 133 133
Continue to review full report at Codecov.
|
Merging to fix all the builds. Thanks @lorenzncode |
* * 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>
I think the conda builds are each tested as part of the build process as there is a pytest command in the meta.yml. Perhaps that limit on pyparsing could be removed from the meta.yml and the conda package could be built locally (which tests during the build process) Lines 27 to 35 in 5147dd8
|
I just build a conda package and it passed the tests without the pyparsing limit. Here is the commands I used git clone git@github.com:CadQuery/cadquery.git
cd cadquery
conda create --name build python=3.9
conda activate build
conda install -c conda-forge boa
>>> edit conda/meta.yml to have a hardcoded PACKAGE_VERSION and PYTHON_VERSION and remove pyparsing version limit
conda mambabuild conda |
Change pyparsing usage to be compatible with version 3 ( cadquery incompatible with pyparsing 3.x #906 )
upcaseTokens -> pyparsing_common.upcaseTokens