[MERGE] turnk

[odoo/odoo.git] / setup.py

diff --git a/setup.py b/setup.py
index 6550392..6e1adad 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -87,17 +87,19 @@ setuptools.setup(
       scripts          = ['openerp-server'],
       data_files       = data(),
       packages         = setuptools.find_packages(),
-      dependency_links = ['http://download.gna.org/pychart/'],
       #include_package_data = True,
       install_requires = [
-          'pychart',
+        # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
+        # It seems there is a single difference, which is a spurious print in generate_docs.py.
+        # It is probably safe to move to PyChart 1.39 (the latest one).
+        # (Let setup.py choose the latest one, and we should check we can remove pychart from
+        # our tree.) http://download.gna.org/pychart/
+        # TODO  'pychart',
           'babel',
-          'docutils',
           'feedparser',
           'gdata',
-          'lxml < 3',
+          'lxml',
           'mako',
-          'psutil',
           'psycopg2',
           'pydot',
           'python-dateutil < 2',
@@ -117,7 +119,6 @@ setuptools.setup(
       extras_require = {
           'SSL' : ['pyopenssl'],
       },
-      tests_require = ['unittest2'],
       **py2exe_options()
 )