Fix for Windows with graphviz installed from conda

conda-forge / python-graphviz-feedstock

A conda-smithy repository for python-graphviz.

BSD 3-Clause "New" or "Revised" License

3 stars 12 forks source link

Fix for Windows with graphviz installed from conda #27

Closed StrikerRUS closed 5 years ago

StrikerRUS commented 5 years ago

This reverts commit 2a4f1a8145bbf79823c40d723821eb16c9689235.

Should fix #25.

Checklist

[x] Used a fork of the feedstock to propose changes
[x] Bumped the build number (if the version is unchanged)
[ ] Reset the build number to 0 (if the version changed)
[ ] Re-rendered with the latest conda-smithy (Use the phrase code>@<space/conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
[ ] Ensured the license file is being packaged.

conda-forge-linter commented 5 years ago

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

jakirkham commented 5 years ago

This is great! Thanks @StrikerRUS. 😀

Could you please also add this patch to source in recipe/meta.yaml?

StrikerRUS commented 5 years ago

@jakirkham Done!

I know less than nothing about recipe building, but it seems to me that this is not needed anymore: 6a6e7ebada33f8e8c843a73eadfecdb1133ec969.

jakirkham commented 5 years ago

Ah good point @StrikerRUS! Forgot we have to do something special to apply the patch. Please feel free to revert that last commit.

StrikerRUS commented 5 years ago

@jakirkham OK, reverted.

scopatz commented 5 years ago

It couldn't apply the patch:

INFO:conda_build.source:Success
Extracting download
source tree in: /home/conda/feedstock_root/build_artifacts/python-graphviz_1559747118119/work
export PREFIX=/home/conda/feedstock_root/build_artifacts/python-graphviz_1559747118119/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_place
export BUILD_PREFIX=/home/conda/feedstock_root/build_artifacts/python-graphviz_1559747118119/_build_env
export SRC_DIR=/home/conda/feedstock_root/build_artifacts/python-graphviz_1559747118119/work
~/recipe_root ~/feedstock_root/build_artifacts/python-graphviz_1559747118119/work
~/feedstock_root/build_artifacts/python-graphviz_1559747118119/work
patching file graphviz/backend.py
Hunk #1 FAILED at 114 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file graphviz/backend.py.rej

jakirkham commented 5 years ago

IIRC the line endings should be CRLF, but I could be wrong about this.

StrikerRUS commented 5 years ago

Any updates, guys?..

jakirkham commented 5 years ago

Did you try my suggestion above?

StrikerRUS commented 5 years ago

@jakirkham You mean set line endings to CRLF in windows-bat.patch?

scopatz commented 5 years ago

yeah, I think that is what he means.

StrikerRUS commented 5 years ago

Seems that CRLF didn't help.

jakirkham commented 5 years ago

I think that helped, but there is now a different issue. Please see the comment above for details.

StrikerRUS commented 5 years ago

@jakirkham

This needs one space before the line break.

Done!

jakirkham commented 5 years ago

We may need to adjust the patch a little bit. See this code for context.

StrikerRUS commented 5 years ago

@jakirkham

We may need to adjust the patch a little bit. See this code for context.

Please check my latest commit.

jakirkham commented 5 years ago

Looks great @StrikerRUS! Thanks for all of the work here.

Please let us know if the new packages work correctly.

Also please feel free to add yourself as a maintainer on this feedstock if you're interested. 🙂

StrikerRUS commented 5 years ago

@jakirkham

Please let us know if the new packages work correctly.

Just checked the newest build: works like a charm!

Also please feel free to add yourself as a maintainer on this feedstock if you're interested. 🙂

Thanks a lot for the suggestion, but I'd prefer to remain ordinary user because this package is only non-required dependency for the package I maintain. Also, I'm not familiar with conda recipes at all.

@jakirkham @scopatz Thanks you guys very much for your patience and great support during the whole process.

scopatz commented 5 years ago

Our pleasure!