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

Build the Windows installer in a proper, modular way #98

Merged
merged 10 commits into from
Jul 13, 2018
Merged

Conversation

daniviga
Copy link
Contributor

@daniviga daniviga commented Jun 15, 2018

This PR changes how the installer for Windows is built and provides many enhancements.

  • All the python dependencies are installed in sys.prefix, thus playing with the PYTHONPATH isn't required anymore. This also allows users to install any python dependency with pip. In the past libraries installed afterward were installed in a different path compared to the distributed libs, causing ugly errors
  • The entry points (like oq, nosetests) are now working properly. We don't have to mock them anymore in the .bat as doskeys or provide fake/out-of-tree entrypoints. This makes also possible to run oq via WINE (which does not full support cmd internals, like doskey); testing via WINE is then a viable option
  • Installation is modular: base deps are (always) installed from pre-installed tree. The Engine and other optional dependencies are installed at installation time directly via pip. This can be easy extended to support further tools (like oq-mbtk) with extra dependencies.

This is a step towards #97

TODO

  • Fix zip generation
  • Update containers after merge

@daniviga daniviga added this to the Next milestone Jun 15, 2018
@@ -35,7 +35,7 @@
!include "WordFunc.nsh"
!include "x64.nsh"

SetCompressor lzma
SetCompressor zlib
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Switch back to lzma

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
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Remove || true

@daniviga daniviga removed the WIP label Jun 19, 2018
@daniviga daniviga merged commit d99672a into master Jul 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant