Merge branch 'kali/use-wheels' into develop

2 files changed, 13 insertions, 4 deletions

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