commit 3f233bfc9284bfada1ea60fb83072ccdf8eb7e29 Author: Arturo Filastò art@fuffa.org Date: Wed Jun 19 23:58:07 2013 +0100

Update setup.py, requirements and Vagrant file --- Vagrantfile | 5 ++--- requirements.txt | 1 + setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile index 90002aa..897838f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -142,9 +142,8 @@ pip install -r requirements.txt echo "Installing ooniprobe" python setup.py install

-echo "Fetching all inputs" -cd /data/ooniprobe/inputs -make lists +cd /usr/share/ooni/ +make geoip

SCRIPT

diff --git a/requirements.txt b/requirements.txt index 2dcab52..b335716 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,7 @@ txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6 parsley>=1.1 +cyclone

# Taken from the versions required by twisted 13.0.0 (latest) transaction>=1.1.1 diff --git a/setup.py b/setup.py index 5f221d0..3c42218 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ for root, dirs, file_names in os.walk('data/'): for file_name in file_names: if not file_name.endswith('.pyc'): files.append(pj(root, file_name)) - data_files.append([pj(usr_share_path, root), files]) + data_files.append([pj(usr_share_path, root.replace('data/', '')), files])

with open('requirements.txt') as f: for line in f: