[FIX] odoo.py setup deps and readme.md

README.md

@@ -1,31 +1,22 @@
-About Odoo
+Odoo is a suite of web based open source business apps.  More info at http://www.odoo.com
-==========
-
-Odoo is a suite of open source Business apps.  More info at http://www.odoo.com
-
-Evaluating Odoo
----------------
-
-The easiest way to test Odoo is the free trial, NO email registration is
-required, select "skip this step" to skip it.
-
-    https://www.odoo.com/page/start
 
 
-Getting starting with Odoo developement
+Testing Odoo
----------------------------------------
+-------------
 
-If you are a developer type the following command at your terminal:
+The easiest way to test it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, you may click "skip this step" to skip it. 
+
+
+Getting started with Odoo developement
+--------------------------------------
+
+If you are a developer type the following command at your terminal [1]:
 
     wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
 
-Then follow the tutorial here:
+Then follow <a href="https://doc.openerp.com/trunk/server/howto/howto_website/">the developer tutorial</a>
 
-    https://doc.openerp.com/trunk/server/howto/howto_website/
+[1] You may want to check the content of the <a href="https://raw.githubusercontent.com/odoo/odoo/master/odoo.py">odoo.py file</a> before executing it.
-
-If you are an Odoo employee type the following to add the odoo-dev remote
-
-    $ cd odoo; ./odoo.py setup_git_dev
 
 
 Packages, tarballs and installers
@@ -42,7 +33,19 @@ Packages, tarballs and installers
         $ sudo apt-get update
         $ sudo apt-get install odoo
 
-* Source tarballs http://nightly.openerp.com/
+* <a href="http://nightly.openerp.com/">Source tarballs</a>
-* Windows installer http://nightly.openerp.com/
+* <a href="http://nightly.openerp.com/">Windows installer</a>
-* RPM package http://nightly.openerp.com/
+* <a href="http://nightly.openerp.com/">RPM package</a>
+
+
+For Odoo employees
+------------------
+
+To add the odoo-dev remote use this command:
+
+    $ ./odoo.py setup_git_dev
+
+To fetch odoo merge pull requests refs use this command:
+
+    $ ./odoo.py setup_git_review
 

doc/git.rst

@@ -7,8 +7,7 @@ Initializing a working copy
 
 Use the easy-setup shell script::
 
-     curl -O https://raw.githubusercontent.com/odoo/odoo/master/checkout.sh
+     curl -O https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python2
-     sh checkout.sh
 
 it will will ask a few questions and create a local copy.
 
@@ -26,7 +25,7 @@ repository can have any number of remotes. The setup script creates 2 remotes:
     the official repository and main branches, roughly corresponds to the old
     "mainline" branches in bazaar. You should never need to push to it, and by
     default your local copy is configured to forbid it.
-``dev``
+``odoo-dev``
     a grab-bag of development branches, you can push your work to it so other
     coworkers can work with you.
 

odoo.py

@@ -25,7 +25,7 @@ GIT_HOOKS_PRE_PUSH = """
 import re
 import sys
 if re.search('github.com[:/]odoo/odoo.git$', sys.argv[2]):
-    print "Pushing to /odoo/odoo.git is forbidden, please push to odoo-dev, use -f to override"
+    print "Pushing to /odoo/odoo.git is forbidden, please push to odoo-dev, use --no-verify to override"
     sys.exit(1)
 """
 
@@ -50,9 +50,11 @@ def git_locate():
     while path != '/':
         gitconfig_path = os.path.join(path, '.git/config')
         if os.path.isfile(gitconfig_path):
-            content = open(gitconfig_path).read()
+            setup_py = os.path.join(path, 'setup.py')
-            if re.search('github.com[:/]odoo/odoo.git', content):
+            if os.path.isfile(setup_py):
-                break
+                content = open(setup_py).read()
+                if content.find('release.py') != -1:
+                    break
         path = os.path.dirname(path)
     if path == '/':
         path = None
@@ -64,7 +66,8 @@ def cmd_setup_git_init():
         printf('git repo found at %s',git_dir)
     else:
         run("git", "init", "odoo")
-        git_dir = os.path.join(os.getcwd(), 'odoo')
+        os.chdir('odoo')
+        git_dir = os.getcwd()
     if git_dir:
         # sane push config for git < 2.0
         run('git','config','push.default','simple')
@@ -92,7 +95,7 @@ def cmd_setup_git_init():
     else:
         printf('no git repo found')
 
-def cmd_setup_git_odoo_dev():
+def cmd_setup_git_dev():
     git_dir = git_locate()
     if git_dir:
         # setup odoo-dev remote
@@ -102,7 +105,7 @@ def cmd_setup_git_odoo_dev():
         run('git','config','--add','remote.odoo-dev.fetch','+refs/pull/*:refs/remotes/odoo-dev/pull/*')
         run('git','remote','update')
 
-def cmd_setup_git_odoo_review():
+def cmd_setup_git_review():
     git_dir = git_locate()
     if git_dir:
         # setup odoo-dev remote
@@ -113,7 +116,7 @@ def cmd_setup_git_odoo_review():
         run('git','config','--add','remote.odoo.fetch','+refs/pull/*:refs/remotes/odoo/pull/*')
 
 def setup_deps_debian(git_dir):
-    debian_control_path = os.path.join(git_dir, 'debian/control')
+    debian_control_path = os.path.join(git_dir, 'setup/debian/control')
     debian_control = open(debian_control_path).read()
     debs = re.findall('python-[0-9a-z]+',debian_control)
     proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty'))

setup.py

@@ -174,7 +174,6 @@ setuptools.setup(
           'python-openid',
           'pytz',
           'pyusb >= 1.0.0b1',
-          'pywebdav < 0.9.8',
           'pyyaml',
           'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab

setup/debian/control

@@ -54,7 +54,6 @@ Recommends:
  ghostscript,
  postgresql,
  python-gevent,
- python-matplotlib,
  poppler-utils
 Description: OpenERP Enterprise Resource Management
  OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main