commit 743cf208ebcb1bda3b8eebc84a8062c0c4afaf40 Author: Arturo Filastò art@fuffa.org Date: Fri Mar 14 12:05:41 2014 +0100

Bump to version 1.0.1

* Update Changelog * Update setup script * Include LICENSE in sdist --- ChangeLog.md | 11 +++++++++++ LICENSE | 2 +- MANIFEST.in | 2 +- nettests/NETTESTS_HAVE_MOVED.txt | 1 - ooni/__init__.py | 4 ++-- setup.py | 12 +++++------- 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md index f79a219..fda5db1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,14 @@ +## v1.0.1 + +* Fix bugs in the traceroute test that lead to not all packets being collected. + +* All values inside of http_requests test are now initialized inside of setUp. + +* Fix a bug that lead to the input value of the report not being set in some + circumstances. + +* Add bridge_reachability test + ## v1.0.0

* Add bouncer support for discovering test helpers and collectors diff --git a/LICENSE b/LICENSE index 43eb027..a45daeb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012-2013, Jacob Appelbaum, Aaron Gibson, Arturo Filastò, Isis Lovecruft, The Tor Project +Copyright (c) 2012-2014, Jacob Appelbaum, Aaron Gibson, Arturo Filastò, Isis Lovecruft, The Tor Project All rights reserved.

Redistribution and use in source and binary forms, with or without diff --git a/MANIFEST.in b/MANIFEST.in index 92586f8..a2e2625 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include README.md ChangeLog.md requirements.txt +include README.md ChangeLog.md requirements.txt LICENSE recursive-include data/decks * include data/inputs/ include data/GeoIP.dat diff --git a/nettests/NETTESTS_HAVE_MOVED.txt b/nettests/NETTESTS_HAVE_MOVED.txt deleted file mode 100644 index 604f2a5..0000000 --- a/nettests/NETTESTS_HAVE_MOVED.txt +++ /dev/null @@ -1 +0,0 @@ -look inside data/nettests/ for all the nettests diff --git a/ooni/__init__.py b/ooni/__init__.py index 82cb67b..86f02b3 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-

-__author__ = "Arturo Filastò" -__version__ = "1.0.0" +__author__ = "Open Observatory of Network Interference" +__version__ = "1.0.1"

__all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', diff --git a/setup.py b/setup.py index 0082365..1410dd7 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #-*- coding: utf-8 -*-

-from ooni import __version__ +from ooni import __version__, __author__ import urllib2 import os import gzip @@ -49,9 +49,9 @@ if hasattr(sys, 'real_prefix'): with open(pj('data', 'ooniprobe.conf.sample.new'), 'w+') as w: with open(pj('data', 'ooniprobe.conf.sample')) as f: for line in f: - if line.startswith(' data_dir: /usr/share/ooni'): + if line.startswith(' data_dir: '): w.write(' data_dir: %s\n' % usr_share_path) - elif line.startswith(' geoip_data_dir: /usr/share/'): + elif line.startswith(' geoip_data_dir: '): w.write(' geoip_data_dir: %s\n' % usr_share_path) else: w.write(line) @@ -88,9 +88,7 @@ for root, dirs, file_names in os.walk('data/'): data_files.append([pj(usr_share_path, root.replace('data/', '')), files])

install_requires = [] -dependency_links = [ - 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' -] +dependency_links = [] with open('requirements.txt') as f: for line in f: if line.startswith("#"): @@ -103,7 +101,7 @@ with open('requirements.txt') as f: setup( name="ooniprobe", version=__version__, - author="Open Observatory of Network Interference", + author=__author__, author_email = "ooni-dev@torproject.org", url="https://ooni.torproject.org/", package_dir={'ooni': 'ooni'},