[tor-commits] [ooni-probe/master] Fix most of the warnings.

[art at torproject.org]

commit 0cd6812213b9548946b301c3b9c88a4eb80ad8a6
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Sep 28 22:46:33 2013 +0200

    Fix most of the warnings.
    
    There is still this error message that is a complete mystery to me.
    This
    http://stackoverflow.com/questions/8295644/pypi-userwarning-unknown-distribution-option-install-requires
    leads me to believe that it should be ok.
    
    This http://python-notes.boredomandlaziness.org/en/latest/pep_ideas/core_packaging_api.html
      makes me want to cry :'(
---
 MANIFEST.in                |    4 ++++
 README                     |    1 +
 data/ooniprobe.conf.sample |    2 +-
 setup.py                   |   10 +++++-----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..0edfe5c
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include README.md ChangeLog.md requirements.txt
+recursive-include data/ui *
+include data/Makefile
+include data/ooniprobe.conf.sample
diff --git a/README b/README
new file mode 120000
index 0000000..42061c0
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index 3128d3d..a4831e8 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -46,7 +46,7 @@ advanced:
     # How many reports to perform concurrently
     reporting_concurrency: 15
     # Specify here a custom data_dir path
-    data_dir: /usr/share/ooni/
+    data_dir: /Users/y/.virtualenvs/ooni/bin/../share/ooni
     oonid_api_port: 8042
 tor:
     #socks_port: 8801
diff --git a/setup.py b/setup.py
index 5ca928d..4443749 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from ooni import __version__
 import os
 from os.path import join as pj
 import sys
-from distutils.core import setup
+from setuptools import setup
 
 install_requires = [
     'txsocksx>=0.0.2',
@@ -47,10 +47,10 @@ with open('requirements.txt') as f:
         install_requires.append(line)
 
 setup(
-    name="ooni-probe",
+    name="ooniprobe",
     version=__version__,
-    author="Arturo Filastò",
-    author_email = "art at torproject.org",
+    author="Open Observatory of Network Interference",
+    author_email = "ooni-dev at torproject.org",
     url="https://ooni.torproject.org/",
     package_dir={'ooni': 'ooni'},
     data_files=data_files,
@@ -62,5 +62,5 @@ setup(
 
     scripts=["bin/ooniprobe"],
     dependency_links=dependency_links,
-    install_requires=install_requires,
+    install_requires=install_requires
 )