diff options
| author | Kali Kaneko <kali@leap.se> | 2017-07-27 12:52:46 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-07-28 21:10:20 -0400 |
| commit | db7f98d9b088fbc316f006819f62f9df917e2a99 (patch) | |
| tree | 3c836b8f0ced6caeba2d6518625c5caf938d5448 /pkg/build_bundle_with_venv.sh | |
| parent | 0c28eadda855482ecbe0defba1d2e9f0e81f0d6a (diff) | |
[bug] ship leap.pixelated_www in bundles
- Resolves: #8993
Diffstat (limited to 'pkg/build_bundle_with_venv.sh')
| -rwxr-xr-x | pkg/build_bundle_with_venv.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh index 7900a9da..d76c5b53 100755 --- a/pkg/build_bundle_with_venv.sh +++ b/pkg/build_bundle_with_venv.sh @@ -6,6 +6,10 @@ ########################################################### # Stop bundling in case of errors set -e + +echo "BUILDING BITMASK BUNDLE..." +git describe + virtualenv venv source venv/bin/activate $VIRTUAL_ENV/bin/pip install appdirs packaging @@ -16,17 +20,15 @@ $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy # fix for #8789 $VIRTUAL_ENV/bin/pip --no-cache-dir install pysqlcipher --install-option="--bundled" # FIXME pixelated needs some things but doesn't declare it -$VIRTUAL_ENV/bin/pip install chardet whoosh +$VIRTUAL_ENV/bin/pip install chardet # FIXME persuade pixelated to stop using requests in favor of treq $VIRTUAL_ENV/bin/pip install requests==2.11.1 # For the Bitmask 0.10 bundles. -$VIRTUAL_ENV/bin/pip install -U leap.soledad.common==0.9.6.post2 -$VIRTUAL_ENV/bin/pip install -U leap.soledad.client==0.9.6.post2 +$VIRTUAL_ENV/bin/pip install -U leap.soledad # CHANGE THIS IF YOU WANT A DIFFERENT BRANCH CHECKED OUT FOR COMMON/SOLEDAD -------------------- -#$VIRTUAL_ENV/bin/pip install -U leap.soledad.common --find-links https://devpi.net/kali/dev -#$VIRTUAL_ENV/bin/pip install -U leap.soledad.client --find-links https://devpi.net/kali/dev +#$VIRTUAL_ENV/bin/pip install -U leap.soledad --find-links https://devpi.net/kali/dev # ---------------------------------------------------------------------------------------------- # XXX hack for the namespace package not being properly handled by pyinstaller @@ -40,8 +42,7 @@ $VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask $VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal $VIRTUAL_ENV/bin/pip install dist/*.whl -# install pixelated from kali dev repo until assets get packaged. -pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/ +pip install leap.pixelated-www leap.pixelated # Get the bundled libzmq $VIRTUAL_ENV/bin/pip uninstall --yes pyzmq |