-
Notifications
You must be signed in to change notification settings - Fork 0
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
Build the Windows installer in a proper, modular way #98
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daniviga
commented
Jun 15, 2018
@@ -35,7 +35,7 @@ | |||
!include "WordFunc.nsh" | |||
!include "x64.nsh" | |||
|
|||
SetCompressor lzma | |||
SetCompressor zlib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Switch back to lzma
daniviga
commented
Jun 15, 2018
wine ../python-dist/python3.5/Scripts/pip3.exe -q install --disable-pip-version-check --force-reinstall --ignore-installed --upgrade --no-deps --no-index --prefix ../python-dist py/*.whl py35/*.whl openquake.*.whl oq_platform*.whl | ||
cd $DIR/oq-dist | ||
for d in *; do | ||
ls $d | grep whl > $d/index.txt || true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove || true
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes how the installer for Windows is built and provides many enhancements.
sys.prefix
, thus playing with thePYTHONPATH
isn't required anymore. This also allows users to install any python dependency withpip
. In the past libraries installed afterward were installed in a different path compared to the distributed libs, causing ugly errorsoq
,nosetests
) are now working properly. We don't have to mock them anymore in the.bat
asdoskeys
or provide fake/out-of-tree entrypoints. This makes also possible to runoq
via WINE (which does not full supportcmd
internals, likedoskey
); testing via WINE is then a viable optionpip
. This can be easy extended to support further tools (likeoq-mbtk
) with extra dependencies.This is a step towards #97
TODO