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

Automated conda build #51

Merged
merged 13 commits into from
Aug 9, 2021
Merged

Automated conda build #51

merged 13 commits into from
Aug 9, 2021

Conversation

shimwell
Copy link
Member

@shimwell shimwell commented Jul 27, 2021

Proposed changes

This PR is another step towards a conda package. This allows the conda package to be built, and pass the conda based tests.

cadquery-jupyter is now optional and the functions that make use of it return a warning message when it is not importable.
This allows the conda based tests to pass without having the package installed.

the circle ci and github action based tests run in an environment with jupyter-cadquery installed so these should be unaffected.

This PR fixes issue #49

Additionally the version number of the conda package is now taken from the setup.py and also the python version is now taken from the conda_build_config.yaml file. These make the build process more compatible with github actions based automation.

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.

  • Pep8 applied
  • Unit tests pass locally with my changes
  • 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 Jul 27, 2021

Codecov Report

Merging #51 (97d1158) into develop (89c77fc) will decrease coverage by 0.39%.
The diff coverage is 48.48%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop      #51      +/-   ##
===========================================
- Coverage    94.61%   94.21%   -0.40%     
===========================================
  Files           76       76              
  Lines         5183     5207      +24     
===========================================
+ Hits          4904     4906       +2     
- Misses         279      301      +22     
Impacted Files Coverage Δ
paramak/utils.py 87.04% <28.57%> (-2.68%) ⬇️
...tric_components/tokamak_plasma_plasmaboundaries.py 91.30% <50.00%> (-8.70%) ⬇️
paramak/reactor.py 89.75% <54.54%> (-0.95%) ⬇️
paramak/shape.py 96.42% <54.54%> (-0.66%) ⬇️

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 89c77fc...97d1158. Read the comment docs.

@shimwell
Copy link
Member Author

The parts that are untested are the try except loops that try to import jupyter-cadquery and prevent conda tests failing

@shimwell shimwell merged commit ea19d51 into develop Aug 9, 2021
@shimwell shimwell deleted the automated_conda_build branch August 10, 2021 08:55
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.

None yet

1 participant