May 2013 - tor-commits - lists.torproject.org

[oonib/master] Remove git, twisted-names, and cyclone from the dependencies list in README.md.
by isis＠torproject.org 04 May '13

04 May '13

commit 972cd19783ef38df5ac8c85fa6c3ed2ea32bc56b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:03:05 2013 +0000 Remove git, twisted-names, and cyclone from the dependencies list in README.md. --- README.md | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index bbad4e2..f176bb4 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,13 @@ -# Dependencies - -The extra dependencies necessary to run OONIB are: - -* twisted-names -* cyclone: https://github.com/fiorix/cyclone +# Dependencies and Installation We recommend that you use a python virtualenv. The recommended commands for setting up an ooni-backend are: - # Get git, python, and setuptools: - sudo apt-get install git python2.7 python2.7-dev python-setuptools + sudo apt-get install build-essential python-dev python-setuptools # Grab the get-pip installer to make sure we have pip>=1.3.0 [1] curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py sudo python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 - # We recommend using a virtualenv and virtualenvwrapper makes this easier: sudo pip install --upgrade virtualenv virtualenvwrapper # Setup the virtualenv directory: export WORKON_HOME=~/.virtualenvs && mkdir -p $WORKON_HOME @@ -22,9 +15,8 @@ setting up an ooni-backend are: # Clone ooni-backend: git clone https://github.com/TheTorProject/ooni-backend.git && cd ooni-backend # Create the virtualenv for ooni-backend... - mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib + mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools --setuptools --no-site-packages oonib # ...and install ooni-backend (sudo is not necessary since we're in a virtualenv): - pip install --global-option --no-index -r requirements.txt python setup.py install [1] Note: pip>=1.3.0 is recommended because it included several security

1 0

[oonib/master] Add transaction and TwistedNames to requirements.txt.
by isis＠torproject.org 04 May '13

04 May '13

commit ad572b1a048afca577bd850741346cee8485f290 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:04:46 2013 +0000 Add transaction and TwistedNames to requirements.txt. --- requirements.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4a25852..de420b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c… https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md… +https://twistedmatrix.com/Releases/Names/13.0/TwistedNames-13.0.0.tar.bz2#md5=9264b6f9fc85e1f7ed31d5fd13eeb48a#egg=TwistedNames https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=47… https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3a… @@ -7,6 +8,7 @@ https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3a… # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast: https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… +https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1e… # If any of the above failed, try the normal way: #PyYAML>=3.10

1 0

[oonib/master] Apparently, travis-lint doesn't find missing quotes. And TravisCI has pip1.3.1.
by isis＠torproject.org 04 May '13

04 May '13

commit 12d6970b4dc37867ffd63a22a528fd9472adb03e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:11:19 2013 +0000 Apparently, travis-lint doesn't find missing quotes. And TravisCI has pip1.3.1. --- .travis.yml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ab2862..bad21ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ language: python before_install: - sudo apt-get install build-essential python-dev python-setuptools tor - - curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py - - sudo python ./get-pip.py - - sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 + #- curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + #- sudo python ./get-pip.py + #- sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 python: - "3.3" - "2.7" - "2.6" install: - - pip -I "https://pypi.python.org/packages/ --use-mirrors -r requirements.txt + - pip -I "https://pypi.python.org/packages/" --use-mirrors -r requirements.txt - python setup.py install # command to run tests, e.g. python setup.py test script:

1 0

[oonib/master] Add .travis.yml file.
by isis＠torproject.org 04 May '13

04 May '13

commit 8280a4a56a3eaf93de3569fd6999ddf61e7bf517 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:06:44 2013 +0000 Add .travis.yml file. * travis-lint reports: (oonib)∃!isisⒶwintermute:~/code/torproject/ooni-backend ∴ travis-lint Hooray, /home/isis/code/torproject/ooni-backend/.travis.yml seems to be solid! (oonib)∃!isisⒶwintermute:~/code/torproject/ooni-backend ∴ date Fri Apr 19 23:06:31 UTC 2013 --- .travis.yml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6ab2862 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: python +before_install: + - sudo apt-get install build-essential python-dev python-setuptools tor + - curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py + - sudo python ./get-pip.py + - sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 +python: + - "3.3" + - "2.7" + - "2.6" +install: + - pip -I "https://pypi.python.org/packages/ --use-mirrors -r requirements.txt + - python setup.py install +# command to run tests, e.g. python setup.py test +script: + - cp ooniprobe.conf.example ooniprobe.conf + - bin/oonib \ No newline at end of file

1 0

[oonib/master] And that should be a lowercase "i".
by isis＠torproject.org 04 May '13

04 May '13

commit 35a786ceb0ddbe6c675ef8d79e000e7a7dd3c42d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:15:16 2013 +0000 And that should be a lowercase "i". --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index bad21ae..1a2509f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ python: - "2.7" - "2.6" install: - - pip -I "https://pypi.python.org/packages/" --use-mirrors -r requirements.txt + - pip install -i "https://pypi.python.org/packages/" --use-mirrors -r requirements.txt - python setup.py install # command to run tests, e.g. python setup.py test script:

1 0

[oonib/master] Presuming missing file 'oonib.conf' to be 'ooniprobe.conf.example'.
by isis＠torproject.org 04 May '13

04 May '13

commit d6fcb5c32f4907933c977172b3ed482f33b090f1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 20 00:14:41 2013 +0000 Presuming missing file 'oonib.conf' to be 'ooniprobe.conf.example'. --- .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba72972..fd5a2b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ install: - python setup.py install # command to run tests, e.g. python setup.py test script: - - cp ooniprobe.conf.example ooniprobe.conf + - cp ooniprobe.conf.example oonib.conf - bin/oonib \ No newline at end of file

1 0

[oonib/master] Install tor keyring in .travis.yml and use deb.tpo for Tor install.
by isis＠torproject.org 04 May '13

04 May '13

commit 19d00c22aa4dbdcfef7add3a42847a5f0558fd7e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:36:24 2013 +0000 Install tor keyring in .travis.yml and use deb.tpo for Tor install. * Change pip's package index command to be in the requirements.txt file. --- .travis.yml | 11 ++++++----- requirements.txt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a2509f..ba72972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ language: python before_install: - - sudo apt-get install build-essential python-dev python-setuptools tor - #- curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py - #- sudo python ./get-pip.py - #- sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 + - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list + - gpg --keyserver keys.gnupg.net --recv 886DDD89 + - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - + - sudo apt-get update + - sudo apt-get install deb.torproject.org-keyring tor tor-geoipdb build-essential python-dev python-setuptools python: - "3.3" - "2.7" - "2.6" install: - - pip install -i "https://pypi.python.org/packages/" --use-mirrors -r requirements.txt + - pip install --use-mirrors -r requirements.txt - python setup.py install # command to run tests, e.g. python setup.py test script: diff --git a/requirements.txt b/requirements.txt index de420b0..32965fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ +-i https://pypi.python.org/packages https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c… https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md… -https://twistedmatrix.com/Releases/Names/13.0/TwistedNames-13.0.0.tar.bz2#md5=9264b6f9fc85e1f7ed31d5fd13eeb48a#egg=TwistedNames https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=47… https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3a…

1 0

[oonib/master] Removing faulting setup.py code.
by isis＠torproject.org 04 May '13

04 May '13

commit 4af3f84381ada737f06bfc176b88194b6969f45a Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Apr 19 23:49:15 2013 +0000 Removing faulting setup.py code. --- setup.py | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/setup.py b/setup.py index 64cce36..e474b0d 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,27 @@ from __future__ import with_statement from setuptools import setup, find_packages -def get_requirements(): - with open('requirements.txt', 'r') as f: - requirements = f.read().splitlines() - - # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in - # requirements.txt we need to add the package name to install_requires and - # the entire url to dependency_links. That way setuptools will be able to - # satisfy the dependency using that url (as long as it is in standard sdist - # format, a single .py file or an egg). - pypi_packages = [] - dependency_links = [] - for package_desc in requirements: - if '#egg=' in package_desc: - dependency_links.append(package_desc) - pypi_packages.append(package_desc.split('#egg=')[-1]) - else: - pypi_packages.append(package_desc) - - return pypi_packages, dependency_links - -install_requires, dependency_links = get_requirements() +#def get_requirements(): +# with open('requirements.txt', 'r') as f: +# requirements = f.read().splitlines() +# +# # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in +# # requirements.txt we need to add the package name to install_requires and +# # the entire url to dependency_links. That way setuptools will be able to +# # satisfy the dependency using that url (as long as it is in standard sdist +# # format, a single .py file or an egg). +# pypi_packages = [] +# dependency_links = [] +# for package_desc in requirements: +# if '#egg=' in package_desc: +# dependency_links.append(package_desc) +# pypi_packages.append(package_desc.split('#egg=')[-1]) +# else: +# pypi_packages.append(package_desc) +# +# return pypi_packages, dependency_links +# +#install_requires, dependency_links = get_requirements() setup( name="oonib", version="0.9", @@ -31,6 +31,6 @@ setup( description="OONI-Probe Backend", scripts=["bin/oonib"], packages=find_packages(), - install_requires=install_requires, - dependency_links=dependency_links, + #install_requires=install_requires, + #dependency_links=dependency_links, )

1 0

[oonib/master] Testing pip1.3.1 without explicit https per-package PI URIs.
by isis＠torproject.org 04 May '13

04 May '13

commit 06611c7a6ff7c2a9ff00f7f4676f8f8213374308 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 20 00:05:37 2013 +0000 Testing pip1.3.1 without explicit https per-package PI URIs. --- requirements.txt | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 32965fa..00aac7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,23 @@ -i https://pypi.python.org/packages -https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c94a383886519e9e7b3dd1ee540247#egg=PyYAML -https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md5=68afff4e1efd3757d934e39f70c99f57#egg=Twisted -https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=477c5ef9cf8902e37105fe450c4d8c5d#egg=cyclone -https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr -https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip +PyYAML>=3.10 +#https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz#md5=74c94a383886519e9e7b3dd1ee540247#egg=PyYAML +Twisted>=12.2.0 +#https://pypi.python.org/packages/source/T/Twisted/Twisted-13.0.0.tar.bz2#md5=68afff4e1efd3757d934e39f70c99f57#egg=Twisted +cyclone>=1.1 +#https://pypi.python.org/packages/source/c/cyclone/cyclone-1.1.tar.gz#md5=477c5ef9cf8902e37105fe450c4d8c5d#egg=cyclone +ipaddr>=2.1.10 +#https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr +pygeoip>=0.2.6 +#https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.2.6.zip#md5=b3ac1bfcd535782bc59af78e722cf5c1#egg=pygeoip # Originally fetched from the hg repo on secdev.org: # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast: https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… -https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction -https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm -# If any of the above failed, try the normal way: -#PyYAML>=3.10 -#Twisted>=12.2.0 -#cyclone>=1.0-rc13 -#ipaddr>=2.1.10 -#pygeoip>=0.2.5 -#storm>=0.19 -#txtorcon>=0.7 +transaction>=1.4.1 +#https://pypi.python.org/packages/source/t/transaction/transaction-1.4.1.zip#md5=8db2680bc0f999219861a67b8f335a88#egg=transaction +storm>=0.19 +#https://pypi.python.org/packages/source/s/storm/storm-0.19.tar.gz#md5=61d1ee4cd2a08639ab917e43fa2c9265#egg=storm +txtorcon>=0.7 +zope.component>=4.0.0 +zope.event>=4.0.0 +zope.interface>=4.0.1

1 0

[oonib/master] Copy oonib.conf.example, not ooniprobe.conf.example.
by isis＠torproject.org 04 May '13

04 May '13

commit fd3ffa8bb05c7b362177eb4c50bfe8b2842e17b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 20 00:22:11 2013 +0000 Copy oonib.conf.example, not ooniprobe.conf.example. --- .travis.yml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd5a2b2..733c2af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ install: - python setup.py install # command to run tests, e.g. python setup.py test script: - - cp ooniprobe.conf.example oonib.conf - - bin/oonib \ No newline at end of file + - cp oonib.conf.example oonib.conf + - bin/oonib

1 0