summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md5
-rwxr-xr-xinstall-pixelated.sh3
-rw-r--r--service/requirements.txt19
-rw-r--r--service/setup.py4
4 files changed, 27 insertions, 4 deletions
diff --git a/README.md b/README.md
index a47a8ad3..d71c1215 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,10 @@ Dependencies are: node, npm, compass (ruby), virtualenv, git
* Activate it with `source .virtualenv/bin/activate`
-* Run the setup with `python setup.py develop --always-unzip`
+* Install the dependencies with `pip install -r requirements.txt`
+ * Install the test dependencies with `pip install -r test_requirements.txt`
+
+* Run the setup with `python setup.py develop`
* Then, to run use `pixelated-user-agent` on the command line
diff --git a/install-pixelated.sh b/install-pixelated.sh
index 3ab8c422..0b8e84fa 100755
--- a/install-pixelated.sh
+++ b/install-pixelated.sh
@@ -47,7 +47,8 @@ LC_ALL=en_US.UTF-8 ./go build
cd ../service
virtualenv .virtualenv
source .virtualenv/bin/activate
-./go develop --always-unzip
+pip install -r requirements.txt
+./go develop
# print usage
cat <<EOF
diff --git a/service/requirements.txt b/service/requirements.txt
new file mode 100644
index 00000000..01b1b760
--- /dev/null
+++ b/service/requirements.txt
@@ -0,0 +1,19 @@
+cryptography==0.6.1
+pyasn1==0.1.7
+gnupg==1.4.0
+Twisted==14.0.2
+service-identity==14.0.0
+klein==0.2.3
+requests==2.5.0
+srp==1.0.5
+dirspec==13.10
+--allow-external dirspec
+--allow-unverified dirspec
+u1db==13.09
+--allow-external u1db
+--allow-unverified u1db
+leap.keymanager==0.3.8
+leap.soledad.common==0.6.0-26-g509f76c
+leap.soledad.client==0.6.0-26-g509f76c
+leap.mail==0.3.9-1-gc1f9c92
+whoosh==2.6.0
diff --git a/service/setup.py b/service/setup.py
index 23dfd134..dceb9fcc 100644
--- a/service/setup.py
+++ b/service/setup.py
@@ -100,8 +100,8 @@ setup(name='pixelated-user-agent',
'dirspec==13.10',
'u1db==13.09',
'leap.keymanager==0.3.8',
- 'leap.soledad.common>=0.6',
- 'leap.soledad.client>=0.6',
+ 'leap.soledad.common==0.6.0-26-g509f76c'.
+ 'leap.soledad.client==0.6.0-26-g509f76c',
'leap.mail==0.3.9-1-gc1f9c92',
'whoosh==2.6.0'
],