commit d88a54c113869fecc83374d340c7ecfe5f8f1220 Author: Arturo Filastò art@fuffa.org Date: Sun Nov 11 20:40:26 2012 +0100

Change required version of txtorcon to that which is stored on pypi. * Refactor README.md with easier installation of scapy. --- README.md | 37 +++++++++++-------------------------- requirements.txt | 2 +- 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md index a6e3469..98edd1e 100644 --- a/README.md +++ b/README.md @@ -37,31 +37,9 @@ The python dependencies required for running ooniprobe are: * BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ * txtorcon: https://github.com/meejah/txtorcon

-### Installing scapy - -Unfortunately the version of scapy that is stored on pypi is out of date, this -means that you will have to manually download and install scapy. - -This can be done like so: - - wget http://www.secdev.org/projects/scapy/files/scapy-latest.tar.gz - tar xzf scapy-latest.tar.gz - cd scapy-* - python setup.py install - -If you are not inside of a virtual env the last command will have to be: - - sudo python setup.py install - -### Installing the rest of dependencies - -The other dependencies can be installed from the requirements.txt with: - - sudo pip install -r requirements.txt - -You are highly recommended to do so from inside of a virtual environment, since -pip does not download the packages via SSL and you will need to install it -system wide. +You are highly recommended to install depedencies from inside of a virtual +environment, since pip does not download the packages via SSL and you will need +to install it system wide.

This will require you to have installed virtualenv.

@@ -73,7 +51,14 @@ To create a new virtual environment do

Then install OONI with:

- pip install -r requirements.txt + pip install https://hg.secdev.org/scapy/archive/tip.zip + pip install -r requirements.txt + +If you decided not to install virtual env and want to download code via http as +run it as root, you may easily do so with: + + pip install https://hg.secdev.org/scapy/archive/tip.zip + sudo pip install -r requirements.txt

## Including your geo data in the test report

diff --git a/requirements.txt b/requirements.txt index 4b7e59e..e9a7bfc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ repoze.sphinx.autointerface>=0.7.1 scapy>=2.1.0 storm>=0.19 transaction>=1.3.0 -txtorcon>=0.7 +txtorcon>=0.6 wsgiref>=0.1.2 zope.component>=4.0.0 zope.event>=4.0.0