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

Docs fix #168

Merged
merged 4 commits into from
Jan 28, 2022
Merged

Docs fix #168

merged 4 commits into from
Jan 28, 2022

Conversation

LiamPattinson
Copy link
Collaborator

Proposed changes

Rather than requiring an update to CadQuery's master version, which diverges quite significantly from v2.1, this pull request keeps CadQuery at 2.1 but tries to fix the python version and pyparsing version for the readthedocs build.

Types of changes

What types of changes does your code introduce to the Paramak?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code refactoring
  • Documentation Update (if none of the other choices apply)
  • New tests

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

@codecov
Copy link

codecov bot commented Jan 28, 2022

Codecov Report

Merging #168 (deaacb9) into develop (983daa0) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #168   +/-   ##
========================================
  Coverage    97.67%   97.67%           
========================================
  Files           77       77           
  Lines         4824     4824           
========================================
  Hits          4712     4712           
  Misses         112      112           

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 983daa0...deaacb9. Read the comment docs.

@shimwell
Copy link
Member

Nice, pinning pyparsing to 2.4.7 sounds like a good plan, I guess this means we can use CQ 2.1 and avoid those tessellation errors.

Looking forward to seeing if the docs work out

@shimwell
Copy link
Member

Congrats @LiamPattinson looks like the ~ solved it. Shall I merge this in

@LiamPattinson
Copy link
Collaborator Author

Amazing! I'd almost lost hope on solving this one. Since making changes to setup.cfg, I'm not sure if the changes to environment.yml are needed anymore. Do you think it's worth reverting environment.yml, or should we just merge as-is?

@shimwell
Copy link
Member

I would merge as is and if further tinkering is beneficial perhaps best on another PR. Mission complete for this one 🎉

@shimwell shimwell merged commit c27ccde into fusion-energy:develop Jan 28, 2022
@shimwell
Copy link
Member

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.

2 participants