summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-05-17 21:39:49 +0200
committerRuben Pollan <meskio@sindominio.net>2017-05-22 12:56:20 +0200
commit4f39b220a0765929fa0d744ce74a8f5125e958c2 (patch)
treecca6da7c71afb3939ec84bec133518993eb1b5d1
parentca6f399c045d5caa21835f762cde877bf2b80ad6 (diff)
[pkg] more precise deps
-rw-r--r--Makefile11
-rwxr-xr-xpkg/build_bundle_with_venv.sh4
2 files changed, 11 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 001788f8..323dcc52 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ dev-mail:
dev-gui:
pip install -e '.[gui]'
- pip install requests whoosh
+ pip install requests==2.11.1 whoosh chardet
pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
dev-backend:
@@ -27,7 +27,7 @@ dev-latest-backend: dev-backend
dev-all:
pip install -e '.[all]'
# install pixelated from our repo until assets get packaged.
- pip install requests whoosh
+ pip install requests==2.11.1 whoosh chardet
pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
dev-latest-all: dev-all
@@ -47,9 +47,12 @@ qt-resources:
doc:
cd docs && make html
-docker_container:
- cd pkg/docker_bundle && docker build -t mybundle .
+bundle_in_virtualenv:
+ pkg/build_bundle_with_venv.sh
bundle_in_docker:
# needs a docker container called 'mybundle', created with 'make docker_container'
cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` mybundle bash
+
+docker_container:
+ cd pkg/docker_bundle && docker build -t mybundle .
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh
index 450261ab..0d68be58 100755
--- a/pkg/build_bundle_with_venv.sh
+++ b/pkg/build_bundle_with_venv.sh
@@ -43,5 +43,9 @@ $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/
+# Get the bundled libzmq
+$VIRTUAL_ENV/bin/pip uninstall --yes pyzmq
+$VIRTUAL_ENV/bin/pip install pyzmq --install-option="--zmq=bundled"
+
make bundle
make bundle_apps