credativ team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/openupgrade-server/7.0-fix_autodoc into lp:openupgrade-server.

Requested reviews:
  OpenUpgrade Committers (openupgrade-committers)

For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-server/7.0-fix_autodoc/+merge/147376

This branch restores the autodoc function of Spinx in on readthedocs.org. https://openupgrade-server.readthedocs.org is a rendering of this branch.
-- 
https://code.launchpad.net/~therp-nl/openupgrade-server/7.0-fix_autodoc/+merge/147376
Your team OpenUpgrade Committers is requested to review the proposed merge of lp:~therp-nl/openupgrade-server/7.0-fix_autodoc into lp:openupgrade-server.

=== modified file 'openerp/openupgrade/doc/source/conf.py'
--- openerp/openupgrade/doc/source/conf.py	2012-11-24 22:22:00 +0000
+++ openerp/openupgrade/doc/source/conf.py	2013-02-08 14:42:22 +0000
@@ -17,7 +17,7 @@
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-sys.path.append(os.path.abspath('../../'))
+sys.path += [os.path.abspath('../../'), os.path.abspath('../../../')]
 
 # General configuration
 # ---------------------

=== modified file 'setup.py'
--- setup.py	2012-12-13 15:59:49 +0000
+++ setup.py	2013-02-08 14:42:22 +0000
@@ -115,7 +115,9 @@
           'psycopg2',
           'pydot',
           'python-dateutil < 2',
-          'python-ldap', # optional
+          # OpenUpgrade: documentation on readthedocs.org does not build
+          # properly if an install of python-ldap is attempted
+          # 'python-ldap', # optional
           'python-openid',
           'pytz',
           'pywebdav',