summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-09-18 13:09:07 -0500
committerKali Kaneko <kali@leap.se>2014-09-19 10:59:13 -0500
commitf66493426a7d0839801c81089ade6511efa1be3a (patch)
treeb8ffa66f2a514b92779bbfb377d88431ea9f64ab
parent94b1b7d4f9ebfed6d1f21646c5709d9f38642af4 (diff)
Use wheels! yeah!
No more infinite time to re-create a virtualenv.
-rw-r--r--Makefile14
-rw-r--r--pkg/requirements-dev.pip10
-rw-r--r--pkg/requirements.pip7
3 files changed, 27 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0008cb39..bbeebc36 100644
--- a/Makefile
+++ b/Makefile
@@ -95,5 +95,19 @@ resource_graph:
./pkg/scripts/monitor_resource.zsh `pgrep bitmask` $(RESOURCE_TIME)
display bitmask-resources.png
+get_wheels:
+ pip install --upgrade setuptools
+ pip install --upgrade pip
+ pip install wheel
+
+gather_wheels:
+ pip wheel --wheel-dir=../wheelhouse pyzmq --build-option "--zmq=bundled"
+ # because fuck u1db externals, that's why...
+ pip wheel --wheel-dir=../wheelhouse --allow-external dirspec --allow-unverified dirspec --allow-external u1db --allow-unverified u1db -r pkg/requirements.pip
+
+install_wheel:
+ # if it's the first time, you'll need to get_wheels first
+ pip install --pre --use-wheel --no-index --find-links=../wheelhouse -r pkg/requirements.pip
+
clean :
$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
diff --git a/pkg/requirements-dev.pip b/pkg/requirements-dev.pip
index 8b5a8d85..799376d2 100644
--- a/pkg/requirements-dev.pip
+++ b/pkg/requirements-dev.pip
@@ -10,8 +10,12 @@
# NOTE: you have to run pip install -r pkg/requirements.pip for pip
# to install it. (do it after python setup.py develop and it
# will only install this)
-
+#
+wheel
sphinx
+ipdb
--e git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common
--e git+https://github.com/leapcode/soledad.git@develop#egg=leap.soledad
+# in case you want to install a package from a git source, you can use this:
+# Useful to test pre-release branches together.
+#-e git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common
+#-e git+https://github.com/leapcode/soledad.git@develop#egg=leap.soledad
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index bf05aa28..9f49bf03 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -9,7 +9,10 @@ argparse
requests>=1.1.0
srp>=1.0.2
pyopenssl
-python-dateutil
+
+# This won't be needed after we refactor leap.common.events
+# to use zmq.
+python-dateutil==1.4 # See https://leap.se/code/issues/6099
psutil
@@ -19,6 +22,8 @@ python-daemon # this should not be needed for Windows.
keyring
zope.proxy
+# You will want to install this bundled if you don't have sodium in your system:
+# pip install pyzmq --install-option="--zmq=bundled"
pyzmq
leap.common>=0.3.7