summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/install_venv.py (renamed from pkg/scripts/install_venv.py)4
-rw-r--r--pkg/requirements-testing.pip13
-rw-r--r--pkg/requirements.pip10
3 files changed, 16 insertions, 11 deletions
diff --git a/pkg/scripts/install_venv.py b/pkg/install_venv.py
index 17dfb984..80bc5d4b 100644
--- a/pkg/scripts/install_venv.py
+++ b/pkg/install_venv.py
@@ -30,7 +30,7 @@ import sys
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
VENV = os.path.join(ROOT, '.venv')
PIP_REQUIRES = os.path.join(ROOT, 'pkg', 'requirements.pip')
-TEST_REQUIRES = os.path.join(ROOT, 'pkg', 'test-requirements.pip')
+TEST_REQUIRES = os.path.join(ROOT, 'pkg', 'requirements-testing.pip')
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
@@ -167,7 +167,7 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
"""
print 'Creating venv...',
if no_site_packages:
- #setuptools and virtualenv don't play nicely together,
+ #setuptools and virtualenv don't play nicely together,
#so we create the virtualenv with the distribute package instead.
#See: view-source:http://pypi.python.org/pypi/distribute
run_command(['virtualenv', '-q', '--distribute', '--no-site-packages', VENV])
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip
index bfa20544..5405a75b 100644
--- a/pkg/requirements-testing.pip
+++ b/pkg/requirements-testing.pip
@@ -1,13 +1,18 @@
nose
nose-exclude
nose-progressive
-mock
+
+
unittest2 # TODO we should include this dep only for python2.6
coverage
pep8==1.1
+tox
#sphinx>=1.1.2
-#tox
-twisted
-zope.interface
+# double reqs
+# (the client already includes, which gives some errors)
+# -----------
+# mock # re-add XXX
+#twisted
+#zope.interface
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 5f69abfb..a7713ec4 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -1,11 +1,11 @@
# in order of addition to the project.
-# do not change the ordering.
+# try not to change the ordering.
#
-argparse
-#
-PySide
+# PySide -- It's a requirement indeed, but
+# it gives troubles when operating inside virtualenvs.
# Use LEAP_VENV_SKIP_PYSIDE to avoid installing it!
+argparse
requests
srp>=1.0.2
pyopenssl
@@ -16,7 +16,7 @@ ipaddr
twisted
qt4reactor
-leap.common>=0.2.4
+leap.common>=0.2.5
leap.soledad>=0.1.0
# Remove this when nickserver is online