Skip to content
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

Merged
merged 3 commits into from
Oct 30, 2021

Conversation

lorenzncode
Copy link
Member

    upcaseTokens -> pyparsing_common.upcaseTokens
@lorenzncode
Copy link
Member Author

This PR is incomplete - could someone update the conda build dependencies to specify pyparsing version 2.1.9 and later?
I do not know how to verify/test the conda build.

I've run the cadquery pytests with pyparsing versions (passing in all cases):
3.0.3
3.0.0
2.4.7
2.4.0
2.1.9

Tests will fail with pyparsing 2.1.8 and earlier.

@codecov
Copy link

codecov bot commented Oct 29, 2021

Codecov Report

Merging #907 (acb5090) into master (20097a9) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           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           
Impacted Files Coverage Δ
cadquery/selectors.py 98.12% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 20097a9...acb5090. Read the comment docs.

@adam-urbanczyk
Copy link
Member

Merging to fix all the builds. Thanks @lorenzncode

@adam-urbanczyk adam-urbanczyk merged commit b4d638a into CadQuery:master Oct 30, 2021
marcus7070 pushed a commit to Jojain/cadquery that referenced this pull request Oct 30, 2021
* * 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>
@lorenzncode lorenzncode deleted the pyparsing-906 branch November 1, 2021 23:05
@shimwell
Copy link
Contributor

shimwell commented Mar 2, 2022

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)

cadquery/conda/meta.yaml

Lines 27 to 35 in 5147dd8

test:
requires:
- pytest
- docutils
- path
source_files:
- tests/
commands:
- pytest -v

@shimwell
Copy link
Contributor

shimwell commented Mar 2, 2022

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

Screenshot from 2022-03-02 20-51-33

@shimwell shimwell mentioned this pull request Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants