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.

Sign up for GitHub

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

Jump to bottom

Add standard and runtime hook for pyproj #33

Merged
merged 9 commits into from
Aug 18, 2020
Merged

Add standard and runtime hook for pyproj #33

merged 9 commits into from
Aug 18, 2020

Conversation

amifunny
Copy link
Contributor

@amifunny amifunny commented Aug 17, 2020 •
edited by Legorooj
Loading

@amifunny amifunny requested review from a team and Legorooj and removed request for a team August 17, 2020 04:49
@amifunny amifunny mentioned this pull request Aug 17, 2020
Closed
Legorooj
Legorooj requested changes Aug 17, 2020
View reviewed changes
Copy link
Member

@Legorooj Legorooj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You also need to add the runtime hook to rthooks.dat. It should be obvious how that goes in.

src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyproj.py Outdated Show resolved Hide resolved
src/_pyinstaller_hooks_contrib/hooks/rthooks/pyi_rth_pyproj.py Outdated Show resolved Hide resolved
amifunny and others added 2 commits August 17, 2020 20:08
@amifunny @Legorooj
Update src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyproj.py
1e23629 
Co-authored-by: Legorooj <50370070+Legorooj@users.noreply.github.com>
@amifunny
Change License
abc3091
@amifunny amifunny requested a review from Legorooj August 17, 2020 14:42
bwoodsend
bwoodsend approved these changes Aug 17, 2020
View reviewed changes
Copy link
Member

@bwoodsend bwoodsend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've done a really thorough job with this one. Nice work.

bwoodsend and others added 2 commits August 17, 2020 16:19
@bwoodsend
Merge branch 'master' into master
0625481
@amifunny @bwoodsend
Update src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyproj.py
b03272f 
Co-authored-by: Brénainn Woodsend <30940778+bwoodsend@users.noreply.github.com>
Legorooj
Legorooj requested changes Aug 18, 2020
View reviewed changes
Copy link
Member

@Legorooj Legorooj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the runtime hook to rthooks.dat - PyInstaller doesn't know it exists otherwise. (Unlike normal hooks you can name rthooks anything - we could actually call this hook bob_the_builder.py and it would work provided you added it to rthooks.dat.

Legorooj
Legorooj approved these changes Aug 18, 2020
View reviewed changes
Copy link
Member

@Legorooj Legorooj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Nice work on this!

@Legorooj Legorooj merged commit da37478 into pyinstaller:master Aug 18, 2020
@Legorooj
Copy link
Member

Legorooj commented Aug 18, 2020 •
edited
Loading

@amifunny suggestion that I might have said before; in the future don't work on master. Work on a feature branch (eg pyproj-hook).

@amifunny
Copy link
Contributor Author

@Legorooj Will keep that in mind

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bwoodsend bwoodsend bwoodsend approved these changes

@Legorooj Legorooj Legorooj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

issues with proj. "ImportError: DLL load failed:"
3 participants
@amifunny @Legorooj @bwoodsend