Skip to content
This repository has been archived by the owner on Feb 9, 2021. It is now read-only.

Also detect FreeCAD from conda on OSX #283

Merged
merged 1 commit into from
Jun 24, 2018

Conversation

bollwyvl
Copy link
Contributor

Now that freecad is installable from conda-forge on linux/osx/win, this also checks in $PREFIX/lib on OSX.

Big thanks to @loooo for suggesting this simple fix over on the conda-forge PR for cadquery, where we're basically applying this patch, as well as getting FreeCAD through the conda-forge process!

@coveralls
Copy link

Coverage Status

Coverage remained the same at 92.252% when pulling 9e003a8 on bollwyvl:feat/detect-osx-conda-path into aef8a91 on dcowden:master.

@dcowden
Copy link
Owner

dcowden commented Jun 24, 2018

@bollwyvl is this ready to be merged? looks ok to me!

@AppVeyorBot
Copy link

Build cadquery 1.0.56 completed (commit 07667809fa by @bollwyvl)

@codecov-io
Copy link

Codecov Report

Merging #283 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #283   +/-   ##
=======================================
  Coverage   92.79%   92.79%           
=======================================
  Files          10       10           
  Lines        2207     2207           
=======================================
  Hits         2048     2048           
  Misses        159      159
Impacted Files Coverage Δ
cadquery/freecad_impl/__init__.py 79.59% <100%> (ø) ⬆️

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 aef8a91...9e003a8. Read the comment docs.

@bollwyvl bollwyvl mentioned this pull request Jun 24, 2018
@bollwyvl
Copy link
Contributor Author

Yeah, this is already tested over on the feedstock. The line is a bit long, but it does what it says on the tin!

@dcowden dcowden merged commit a84ef3d into dcowden:master Jun 24, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants