[MERGE] forward port branch 11.0 up to e1104ac344c

12 files changed, 261 insertions, 257 deletions

diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index 06d597d7d52..b71de1a6f9f 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -1,6 +1,6 @@
 # Please note that this Dockerfile is used for testing nightly builds and should
 # not be used to deploy Odoo
-FROM debian:jessie
+FROM debian:stretch
 MAINTAINER Odoo S.A. <info@odoo.com>
 
 RUN apt-get update && \
@@ -20,38 +20,34 @@ RUN apt-get update -qq &&  \
 		node-less \
 		postgresql \
 		postgresql-client \
-		python \
-		python-babel \
-		python-dateutil \
-		python-decorator \
-		python-docutils \
-		python-feedparser \
-		python-html2text \
-		python-imaging \
-		python-jinja2 \
-		python-ldap \
-		python-libxslt1 \
-		python-lxml \
-		python-mako \
-		python-mock \
-		python-openid \
-		python-passlib \
-		python-psutil \
-		python-psycopg2 \
-		python-pychart \
-		python-pydot \
-		python-pyparsing \
-		python-pypdf2 \
-		python-reportlab \
-		python-requests \
-		python-suds \
-		python-tz \
-		python-vatnumber \
-		python-vobject \
-		python-werkzeug \
-		python-xlsxwriter \
-		python-xlwt \
-		python-yaml -y && \
+		python3 \
+        python3-babel \
+        python3-dateutil \
+        python3-decorator \
+        python3-docutils \
+        python3-feedparser \
+        python3-html2text \
+        python3-pil \
+        python3-jinja2 \
+        python3-lxml \
+        python3-mako \
+        python3-mock \
+        python3-openid \
+        python3-passlib \
+        python3-psutil \
+        python3-psycopg2 \
+        python3-pydot \
+        python3-pyparsing \
+        python3-pypdf2 \
+        python3-reportlab \
+        python3-requests \
+        python3-suds \
+        python3-tz \
+        python3-vatnumber \
+        python3-vobject \
+        python3-werkzeug \
+        python3-xlsxwriter \
+		python3-yaml -y && \
 	rm -rf /var/lib/apt/lists/*
 
 RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.dffedora b/setup/package.dffedora
index 5d6bd2f4f21..683f34c2d8f 100644
--- a/setup/package.dffedora
+++ b/setup/package.dffedora
@@ -1,38 +1,52 @@
 # Please note that this Dockerfile is used for testing nightly builds and should
 # not be used to deploy Odoo
-FROM fedora:24
+FROM fedora:26
 MAINTAINER Odoo S.A. <info@odoo.com>
 
 # Dependencies and postgres
 RUN dnf update -d 0 -e 0 -y && \
 	dnf install -d 0 -e 0 \
 		babel \
-		libxslt-python \
 		nodejs-less \
 		pychart \
 		pyparsing \
-		python-babel \
-		python-dateutil \
-		python-decorator \
-		python-docutils \
-		python-feedparser \
-		python-html2text \
-		python-imaging \
-		python-jinja2 \
-		python-ldap \
-		python-lxml \
-		python-mako \
-		python-mock \
-		python-openid \
-		python-passlib \
-		python-psutil \
-		python-psycopg2 \
-		python-reportlab \
-		python-requests \
-		python-vobject \
-		python-werkzeug \
-		python-xlwt \
-		python-yaml \
+		python3-babel \
+	  python3-decorator \
+	  python3-docutils \
+	  python3-feedparser \
+	  python3-gevent \
+	  python3-greenlet \
+	  python3-html2text \
+	  python3-jinja2 \
+	  python3-lxml \
+	  python3-mako \
+	  python3-markupsafe \
+	  python3-mock \
+	  python3-num2words \
+	  python3-ofxparse \
+	  python3-passlib \
+	  python3-pillow \
+	  python3-psutil \
+	  python3-pydot \
+	  python3-pyldap \
+	  python3-pyparsing \
+	  python3-PyPDF2 \
+	  python3-pyserial \
+	  python3-dateutil \
+	  python3-openid \
+	  python3-pytz \
+	  python3-pyusb \
+	  python3-PyYAML \
+	  python3-qrcode \
+	  python3-reportlab \
+	  python3-requests \
+	  python3-six \
+	  python3-suds \
+	  python3-vatnumber \
+	  python3-vobject \
+	  python3-werkzeug \
+	  python3-xlwt \
+	  python3-xlrd \
 		pytz \
 		postgresql \
 		postgresql-server \
@@ -41,7 +55,7 @@ RUN dnf update -d 0 -e 0 -y && \
 		postgresql-devel -y && \
 	dnf clean all
 
-RUN easy_install pyPdf2 vatnumber pydot psycogreen suds ofxparse XlsxWriter
+RUN pip3 install XlsxWriter
 
 # Postgres configuration
 RUN mkdir -p /var/lib/postgres/data
diff --git a/setup/package.dfsrc b/setup/package.dfsrc
index 73e4e6cd457..0f23aea4f5b 100644
--- a/setup/package.dfsrc
+++ b/setup/package.dfsrc
@@ -1,6 +1,6 @@
 # Please note that this Dockerfile is used for testing nightly builds and should
 # not be used to deploy Odoo
-FROM debian:jessie
+FROM debian:stretch
 MAINTAINER Odoo S.A. <info@odoo.com>
 
 RUN apt-get update && \
@@ -27,17 +27,18 @@ RUN apt-get update -qq &&  \
 		libsasl2-dev \
 		libssl-dev \
 		libjpeg-dev \
-		python-dev \
-		python-pip \
+		zlib1g-dev \
+		python3-dev \
+		python3-pip \
+		python3-wheel \
 		build-essential \
-		python -y && \
-	easy_install --upgrade pip && \
+		python3 -y && \
 	rm -rf /var/lib/apt/lists/*
 
-RUN pip install --upgrade pip
+RUN pip3 install --upgrade pip
 
 COPY requirements.txt /opt/release/requirements.txt
 
-RUN pip install -r /opt/release/requirements.txt
+RUN pip3 install -r /opt/release/requirements.txt
 
 RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.py b/setup/package.py
index c3eedeee3e7..3fcb96aed92 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
+from __future__ import print_function
+import logging
 import optparse
 import os
 import pexpect
@@ -10,6 +11,7 @@ import signal
 import subprocess
 import tempfile
 import time
+import traceback
 try:
     from xmlrpc import client as xmlrpclib
 except ImportError:
@@ -17,7 +19,7 @@ except ImportError:
 from contextlib import contextmanager
 from glob import glob
 from os.path import abspath, dirname, join
-from sys import stdout
+from sys import stdout, stderr
 from tempfile import NamedTemporaryFile
 
 # apt-get install rsync python-pexpect debhelper python-setuptools
@@ -26,7 +28,7 @@ from tempfile import NamedTemporaryFile
 # Utils
 #----------------------------------------------------------
 exec(open(join(dirname(__file__), '..', 'odoo', 'release.py'), 'rb').read())
-version = version.split('-')[0]
+version = version.split('-')[0].replace('saas~','')
 docker_version = version.replace('+', '')
 timestamp = time.strftime("%Y%m%d", time.gmtime())
 GPGPASSPHRASE = os.getenv('GPGPASSPHRASE')
@@ -40,12 +42,25 @@ PUBLISH_DIRS = {
 ADDONS_NOT_TO_PUBLISH = [
 ]
 
+
+def move_glob(source, wildcards, destination):
+    """Move files matched by wildcards from source to destination
+    wildcards can be a single string wildcard like '*.deb' or a list of wildcards
+    """
+    if not os.path.isdir(destination):
+        raise BaseException('Destination "{}" is not a directory'.format(destination))
+    if isinstance(wildcards, str):
+        wildcards = [wildcards]
+    for wc in wildcards:
+        for file_path in glob(os.path.join(source, wc)):
+            shutil.move(file_path, destination)
+
 def mkdir(d):
     if not os.path.isdir(d):
         os.makedirs(d)
 
 def system(l, chdir=None):
-    print l
+    logging.info("System call: {}".format(l))
     if chdir:
         cwd = os.getcwd()
         os.chdir(chdir)
@@ -69,12 +84,12 @@ def _rpc_count_modules(addr='http://127.0.0.1', port=8069, dbname='mycompany'):
             dbname, 1, 'admin', 'ir.module.module', 'search', [('state', '=', 'to install')]
         )
         if toinstallmodules:
-            print("Package test: FAILED. Not able to install dependencies of base.")
+            logging.error("Package test: FAILED. Not able to install dependencies of base.")
             raise Exception("Installation of package failed")
         else:
-            print("Package test: successfuly installed %s modules" % len(modules))
+            logging.info("Package test: successfuly installed %s modules" % len(modules))
     else:
-        print("Package test: FAILED. Not able to install base.")
+        logging.error("Package test: FAILED. Not able to install base.")
         raise Exception("Installation of package failed")
 
 def publish(o, type, extensions):
@@ -101,8 +116,9 @@ def publish(o, type, extensions):
 
     published = []
     for extension in extensions:
-        release = glob("%s/odoo_*.%s" % (o.build_dir, extension))[0]
-        published.append(_publish(o, release))
+        release = glob("%s/odoo_*.%s" % (o.build_dir, extension))
+        if release:
+            published.append(_publish(o, release[0]))
     return published
 
 class OdooDocker(object):
@@ -134,10 +150,10 @@ class OdooDocker(object):
         try:
             _rpc_count_modules(port=str(self.port))
         except Exception as e:
-            print('Exception during docker execution: %s:' % str(e))
-            print('Error during docker execution: printing the bash output:')
+            logging.error('Exception during docker execution: %s:' % str(e))
+            logging.error('Error during docker execution: printing the bash output:')
             with open(self.log_file.name) as f:
-                print '\n'.join(f.readlines())
+                print('\n'.join(f.readlines()), file=stderr)
             raise
         finally:
             self.docker.close()
@@ -165,18 +181,18 @@ class KVM(object):
         self.login = login
 
     def timeout(self,signum,frame):
-        print "vm timeout kill",self.pid
+        logging.warning("vm timeout kill",self.pid)
         os.kill(self.pid,15)
 
     def start(self):
-        l="kvm -net nic,model=rtl8139 -net user,hostfwd=tcp:127.0.0.1:10022-:22,hostfwd=tcp:127.0.0.1:18069-:8069,hostfwd=tcp:127.0.0.1:15432-:5432 -drive".split(" ")
+        l="kvm -cpu core2duo -smp 2,sockets=2,cores=1,threads=1 -net nic,model=rtl8139 -net user,hostfwd=tcp:127.0.0.1:10022-:22,hostfwd=tcp:127.0.0.1:18069-:8069,hostfwd=tcp:127.0.0.1:15432-:5432 -m 1024 -drive".split(" ")
         #l.append('file=%s,if=virtio,index=0,boot=on,snapshot=on'%self.image)
         l.append('file=%s,snapshot=on'%self.image)
         #l.extend(['-vnc','127.0.0.1:1'])
         l.append('-nographic')
-        print " ".join(l)
+        logging.info("Starting kvm: {}".format( " ".join(l)))
         self.pid=os.spawnvp(os.P_NOWAIT, l[0], l)
-        time.sleep(10)
+        time.sleep(50)
         signal.alarm(2400)
         signal.signal(signal.SIGALRM, self.timeout)
         try:
@@ -190,7 +206,7 @@ class KVM(object):
         l=['ssh','-o','UserKnownHostsFile=/dev/null','-o','StrictHostKeyChecking=no','-p','10022','-i',self.ssh_key,'%s@127.0.0.1'%self.login,cmd]
         system(l)
 
-    def rsync(self,args,options='--delete --exclude .bzrignore'):
+    def rsync(self,args,options='--delete --exclude .git --exclude .tx --exclude __pycache__'):
         cmd ='rsync -rt -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 -i %s" %s %s' % (self.ssh_key, options, args)
         system(cmd)
 
@@ -200,17 +216,20 @@ class KVM(object):
 class KVMWinBuildExe(KVM):
     def run(self):
         with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f:
-            f.write("VERSION=%s\n" % version)
+            f.write("VERSION=%s\n" % version.replace('~', '_').replace('+', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.python'), 'w') as f:
             f.write("PYTHON_VERSION=%s\n" % self.o.vm_winxp_python_version.replace('.', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.servicename'), 'w') as f:
             f.write("SERVICENAME=%s\n" % nt_service_name)
 
+        remote_build_dir = '/cygdrive/c/odoobuild/server/'
+
         self.ssh("mkdir -p build")
-        self.rsync('%s/ %s@127.0.0.1:build/server/' % (self.o.build_dir, self.login))
-        self.ssh("cd build/server/setup/win32;time make allinone;")
-        self.rsync('%s@127.0.0.1:build/server/setup/win32/release/ %s/' % (self.login, self.o.build_dir), '')
-        print "KVMWinBuildExe.run(): done"
+        logging.info("Syncing Odoo files to virtual machine...")
+        self.rsync('%s/ %s@127.0.0.1:%s' % (self.o.build_dir, self.login, remote_build_dir))
+        self.ssh("cd {}setup/win32;time make allinone;".format(remote_build_dir))
+        self.rsync('%s@127.0.0.1:%ssetup/win32/release/ %s/' % (self.login, remote_build_dir, self.o.build_dir), '')
+        logging.info("KVMWinBuildExe.run(): done")
 
 class KVMWinTestExe(KVM):
     def run(self):
@@ -229,21 +248,28 @@ class KVMWinTestExe(KVM):
 # Stage: building
 #----------------------------------------------------------
 def _prepare_build_dir(o, win32=False):
+    
     cmd = ['rsync', '-a', '--exclude', '.git', '--exclude', '*.pyc', '--exclude', '*.pyo']
     if not win32:
         cmd += ['--exclude', 'setup/win32']
     system(cmd + ['%s/' % o.odoo_dir, o.build_dir])
-    try:
-        for addon_path in glob(join(o.build_dir, 'addons/*')):
-            if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
+    for addon_path in glob(join(o.build_dir, 'addons/*')):
+        if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
+            try:
                 shutil.move(addon_path, join(o.build_dir, 'odoo/addons'))
-    except shutil.Error:
-        # Thrown when the add-on is already in odoo/addons (if _prepare_build_dir
-        # has already been called once)
-        pass
+            except shutil.Error as e:
+                # Thrown when the add-on is already in odoo/addons (if _prepare_build_dir
+                # has already been called once)
+                logging.warning("Warning '{}' while moving addon '{}'".format(e,addon_path))
+                if addon_path.startswith(o.build_dir) and os.path.isdir(addon_path):
+                    logging.info("Removing '{}'".format(addon_path))
+                    try:
+                        shutil.rmtree(addon_path)
+                    except shutil.Error as rm_error:
+                        logging.warning("Cannot remove '{}': {}".format(addon_path, rm_error))
 
 def build_tgz(o):
-    system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
+    system(['python3', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
     system(['mv', glob('%s/dist/odoo-*.tar.gz' % o.build_dir)[0], '%s/odoo_%s.%s.tar.gz' % (o.build_dir, version, timestamp)])
     system(['mv', glob('%s/dist/odoo-*.zip' % o.build_dir)[0], '%s/odoo_%s.%s.zip' % (o.build_dir, version, timestamp)])
 
@@ -251,21 +277,24 @@ def build_deb(o):
     # Append timestamp to version for the .dsc to refer the right .tar.gz
     cmd=['sed', '-i', '1s/^.*$/odoo (%s.%s) stable; urgency=low/'%(version,timestamp), 'debian/changelog']
     subprocess.call(cmd, cwd=o.build_dir)
-    deb = pexpect.spawn('dpkg-buildpackage -rfakeroot -k%s' % GPGID, cwd=o.build_dir)
-    deb.logfile = stdout
-    if GPGPASSPHRASE:
-        deb.expect_exact('Enter passphrase: ', timeout=1200)
-        deb.send(GPGPASSPHRASE + '\r\n')
-        deb.expect_exact('Enter passphrase: ')
-        deb.send(GPGPASSPHRASE + '\r\n')
-    deb.expect(pexpect.EOF, timeout=1200)
-    system(['mv', glob('%s/../odoo_*.deb' % o.build_dir)[0], '%s' % o.build_dir])
-    system(['mv', glob('%s/../odoo_*.dsc' % o.build_dir)[0], '%s' % o.build_dir])
-    system(['mv', glob('%s/../odoo_*_amd64.changes' % o.build_dir)[0], '%s' % o.build_dir])
-    system(['mv', glob('%s/../odoo_*.tar.gz' % o.build_dir)[0], '%s' % o.build_dir])
+    if not o.no_debsign:
+        deb = pexpect.spawn('dpkg-buildpackage -rfakeroot -k%s' % GPGID, cwd=o.build_dir)
+        deb.logfile = stdout.buffer
+        if GPGPASSPHRASE:
+            deb.expect_exact('Enter passphrase: ', timeout=1200)
+            deb.send(GPGPASSPHRASE + '\r\n')
+            deb.expect_exact('Enter passphrase: ')
+            deb.send(GPGPASSPHRASE + '\r\n')
+        deb.expect(pexpect.EOF, timeout=1200)
+    else:
+        subprocess.call(['dpkg-buildpackage', '-rfakeroot', '-uc', '-us'], cwd=o.build_dir)
+    # As the packages are builded in the parent of the buildir, we move them back to build_dir
+    build_dir_parent = '{}/../'.format(o.build_dir)
+    wildcards = ['odoo_{}'.format(wc) for wc in ('*.deb', '*.dsc', '*_amd64.changes', '*.tar.gz', '*.tar.xz')]
+    move_glob(build_dir_parent, wildcards, o.build_dir)
 
 def build_rpm(o):
-    system(['python2', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir)
+    system(['python3', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir)
     system(['mv', glob('%s/dist/odoo-*.noarch.rpm' % o.build_dir)[0], '%s/odoo_%s.%s.noarch.rpm' % (o.build_dir, version, timestamp)])
 
 def build_exe(o):
@@ -276,7 +305,9 @@ def build_exe(o):
 # Stage: testing
 #----------------------------------------------------------
 def _prepare_testing(o):
+    logging.info('Preparing testing')
     if not o.no_tarball:
+        logging.info('Preparing docker container instance for tarball')
         subprocess.call(["mkdir", "docker_src"], cwd=o.build_dir)
         subprocess.call(["cp", "package.dfsrc", os.path.join(o.build_dir, "docker_src", "Dockerfile")],
                         cwd=os.path.join(o.odoo_dir, "setup"))
@@ -286,6 +317,7 @@ def _prepare_testing(o):
         subprocess.call(["docker", "build", "-t", "odoo-%s-src-nightly-tests" % docker_version, "."],
                         cwd=os.path.join(o.build_dir, "docker_src"))
     if not o.no_debian:
+        logging.info('Preparing docker container instance for debian')
         subprocess.call(["mkdir", "docker_debian"], cwd=o.build_dir)
         subprocess.call(["cp", "package.dfdebian", os.path.join(o.build_dir, "docker_debian", "Dockerfile")],
                         cwd=os.path.join(o.odoo_dir, "setup"))
@@ -295,6 +327,7 @@ def _prepare_testing(o):
         subprocess.call(["docker", "build", "-t", "odoo-%s-debian-nightly-tests" % docker_version, "."],
                         cwd=os.path.join(o.build_dir, "docker_debian"))
     if not o.no_rpm:
+        logging.info('Preparing docker container instance for RPM') 
         subprocess.call(["mkdir", "docker_fedora"], cwd=o.build_dir)
         subprocess.call(["cp", "package.dffedora", os.path.join(o.build_dir, "docker_fedora", "Dockerfile")],
                         cwd=os.path.join(o.odoo_dir, "setup"))
@@ -302,6 +335,7 @@ def _prepare_testing(o):
                         cwd=os.path.join(o.build_dir, "docker_fedora"))
 
 def test_tgz(o):
+    logging.info('Testing tarball in docker')
     with docker('odoo-%s-src-nightly-tests' % docker_version, o.build_dir, o.pub) as wheezy:
         wheezy.release = '*.tar.gz'
         wheezy.system("service postgresql start")
@@ -315,6 +349,7 @@ def test_tgz(o):
         wheezy.system('su odoo -s /bin/bash -c "odoo --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany &"')
 
 def test_deb(o):
+    logging.info('Testing deb package in docker')
     with docker('odoo-%s-debian-nightly-tests' % docker_version, o.build_dir, o.pub) as wheezy:
         wheezy.release = '*.deb'
         wheezy.system("service postgresql start")
@@ -325,6 +360,7 @@ def test_deb(o):
         wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"')
 
 def test_rpm(o):
+    logging.info('Testing rpm in docker')
     with docker('odoo-%s-fedora-nightly-tests' % docker_version, o.build_dir, o.pub) as fedora24:
         fedora24.release = '*.noarch.rpm'
         # Start postgresql
@@ -337,6 +373,7 @@ def test_rpm(o):
         fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"')
 
 def test_exe(o):
+    logging.info('Testng windows installer in KVM')
     KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start()
 
 #---------------------------------------------------------
@@ -344,7 +381,7 @@ def test_exe(o):
 #---------------------------------------------------------
 def gen_deb_package(o, published_files):
     # Executes command to produce file_name in path, and moves it to o.pub/deb
-    def _gen_file(o, (command, file_name), path):
+    def _gen_file(o, command, file_name, path):
         cur_tmp_file_path = os.path.join(path, file_name)
         with open(cur_tmp_file_path, 'w') as out:
             subprocess.call(command, stdout=out, cwd=path)
@@ -363,13 +400,14 @@ def gen_deb_package(o, published_files):
     ]
     # Generate files
     for command in commands:
-        _gen_file(o, command, temp_path)
+        _gen_file(o, command[0], command[-1], temp_path)
     # Remove temp directory
     shutil.rmtree(temp_path)
 
-    # Generate Release.gpg (= signed Release)
-    # Options -abs: -a (Create ASCII armored output), -b (Make a detach signature), -s (Make a signature)
-    subprocess.call(['gpg', '--default-key', GPGID, '--passphrase', GPGPASSPHRASE, '--yes', '-abs', '--no-tty', '-o', 'Release.gpg', 'Release'], cwd=os.path.join(o.pub, 'deb'))
+    if not o.no_debsign:
+        # Generate Release.gpg (= signed Release)
+        # Options -abs: -a (Create ASCII armored output), -b (Make a detach signature), -s (Make a signature)
+        subprocess.call(['gpg', '--default-key', GPGID, '--passphrase', GPGPASSPHRASE, '--yes', '-abs', '--no-tty', '-o', 'Release.gpg', 'Release'], cwd=os.path.join(o.pub, 'deb'))
 
 #---------------------------------------------------------
 # Generates an RPM repo
@@ -403,22 +441,29 @@ def options():
     root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
     build_dir = "%s-%s" % (root, timestamp)
 
+    log_levels = { "debug" : logging.DEBUG, "info": logging.INFO, "warning": logging.WARN, "error": logging.ERROR, "critical": logging.CRITICAL }
+
     op.add_option("-b", "--build-dir", default=build_dir, help="build directory (%default)", metavar="DIR")
     op.add_option("-p", "--pub", default=None, help="pub directory (%default)", metavar="DIR")
     op.add_option("", "--no-testing", action="store_true", help="don't test the builded packages")
 
     op.add_option("", "--no-debian", action="store_true", help="don't build the debian package")
+    op.add_option("", "--no-debsign", action="store_true", help="don't sign the debian package")
     op.add_option("", "--no-rpm", action="store_true", help="don't build the rpm package")
     op.add_option("", "--no-tarball", action="store_true", help="don't build the tarball")
     op.add_option("", "--no-windows", action="store_true", help="don't build the windows package")
 
     # Windows VM
-    op.add_option("", "--vm-winxp-image", default='/home/odoo/vm/winxp27/winxp27.vdi', help="%default")
-    op.add_option("", "--vm-winxp-ssh-key", default='/home/odoo/vm/winxp27/id_rsa', help="%default")
+    op.add_option("", "--vm-winxp-image", default='/home/odoo/vm/win1036/win10_winpy36.qcow2', help="%default")
+    op.add_option("", "--vm-winxp-ssh-key", default='/home/odoo/vm/win1036/id_rsa', help="%default")
     op.add_option("", "--vm-winxp-login", default='Naresh', help="Windows login (%default)")
-    op.add_option("", "--vm-winxp-python-version", default='2.7', help="Windows Python version installed in the VM (default: %default)")
+    op.add_option("", "--vm-winxp-python-version", default='3.6', help="Windows Python version installed in the VM (default: %default)")
+    
+    op.add_option("", "--no-remove", action="store_true", help="don't remove build dir")
+    op.add_option("", "--logging", action="store", type="choice", choices=list(log_levels.keys()), default="info", help="Logging level")
 
     (o, args) = op.parse_args()
+    logging.basicConfig(format='%(asctime)s %(levelname)s: %(message)s', datefmt='%Y-%m-%d %I:%M:%S', level=log_levels[o.logging])
     # derive other options
     o.odoo_dir = root
     o.pkg = join(o.build_dir, 'pkg')
@@ -440,16 +485,17 @@ def main():
                     test_tgz(o)
                 published_files = publish(o, 'tarball', ['tar.gz', 'zip'])
             except Exception as e:
-                print("Won't publish the tgz release.\n Exception: %s" % str(e))
+                logging.error("Won't publish the tgz release.\n Exception: %s" % str(e))
         if not o.no_debian:
             build_deb(o)
             try:
                 if not o.no_testing:
                     test_deb(o)
-                published_files = publish(o, 'debian', ['deb', 'dsc', 'changes', 'tar.gz'])
+                published_files = publish(o, 'debian', ['deb', 'dsc', 'changes', 'tar.xz'])
                 gen_deb_package(o, published_files)
             except Exception as e:
-                print("Won't publish the deb release.\n Exception: %s" % str(e))
+                logging.error("Won't publish the deb release.\n Exception: %s" % str(e))
+                traceback.print_exc()
         if not o.no_rpm:
             build_rpm(o)
             try:
@@ -458,7 +504,7 @@ def main():
                 published_files = publish(o, 'redhat', ['noarch.rpm'])
                 gen_rpm_repo(o, published_files[0])
             except Exception as e:
-                print("Won't publish the rpm release.\n Exception: %s" % str(e))
+                logging.error("Won't publish the rpm release.\n Exception: %s" % str(e))
         if not o.no_windows:
             _prepare_build_dir(o, win32=True)
             build_exe(o)
@@ -467,16 +513,20 @@ def main():
                     test_exe(o)
                 published_files = publish(o, 'windows', ['exe'])
             except Exception as e:
-                print("Won't publish the exe release.\n Exception: %s" % str(e))
-    except:
-        pass
+                logging.error("Won't publish the exe release.\n Exception: %s" % str(e))
+    except Exception as e:
+        logging.error('Something bad happened ! : {}'.format(e))
+        traceback.print_exc()
     finally:
-        shutil.rmtree(o.build_dir)
-        print('Build dir %s removed' % o.build_dir)
+        if o.no_remove:
+            logging.info('Build dir "{}" not removed'.format(o.build_dir))
+        else:
+            shutil.rmtree(o.build_dir)
+            logging.info('Build dir %s removed' % o.build_dir)
 
         if not o.no_testing:
             system("docker rm -f `docker ps -a | awk '{print $1 }'` 2>>/dev/null")
-            print('Remaining dockers removed')
+            logging.info('Remaining dockers removed')
 
 
 if __name__ == '__main__':
diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh
index e214d04acff..982cc8759e9 100644
--- a/setup/redhat/install.sh
+++ b/setup/redhat/install.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -e
-python setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.6/site-packages/
diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh
index 941cb2c5105..54b1b5cd56f 100644
--- a/setup/redhat/postinstall.sh
+++ b/setup/redhat/postinstall.sh
@@ -28,7 +28,7 @@ db_host = False
 db_port = False
 db_user = $ODOO_USER
 db_password = False
-addons_path = /usr/lib/python2.7/site-packages/odoo/addons
+addons_path = /usr/lib/python3.6/site-packages/odoo/addons
 " > $ODOO_CONFIGURATION_FILE
     chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
     chmod 0640 $ODOO_CONFIGURATION_FILE
@@ -54,8 +54,8 @@ Type=simple
 User=odoo
 Group=odoo
 ExecStart=/usr/bin/odoo --config $ODOO_CONFIGURATION_FILE --logfile $ODOO_LOG_FILE
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
 EOF
-easy_install pyPdf2 vatnumber pydot psycogreen suds ofxparse XlsxWriter
diff --git a/setup/setup_dev.py b/setup/setup_dev.py
index a5194c70569..bc430db42b6 100755
--- a/setup/setup_dev.py
+++ b/setup/setup_dev.py
@@ -13,6 +13,7 @@
 # subclassing the Command object
 #
 #----------------------------------------------------------
+from __future__ import print_function
 import os
 import re
 import sys
@@ -28,7 +29,7 @@ if re.search('github.com[:/]odoo/odoo.git$', sys.argv[2]):
 """
 
 def printf(f,*l):
-    print "odoo:" + f % l
+    print("odoo:" + f % l)
 
 def run(*l):
     if isinstance(l[0], list):
@@ -117,7 +118,7 @@ def cmd_setup_git_review():
 def setup_deps_debian(git_dir):
     debian_control_path = os.path.join(git_dir, 'debian/control')
     debian_control = open(debian_control_path).read()
-    debs = re.findall('python-[0-9a-z]+',debian_control)
+    debs = re.findall('python3-[0-9a-z]+',debian_control)
     debs += ["postgresql"]
     proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty'))
     proc.communicate()
diff --git a/setup/win32/Makefile b/setup/win32/Makefile
index c0d33c904b1..2efa1db6f69 100644
--- a/setup/win32/Makefile
+++ b/setup/win32/Makefile
@@ -10,7 +10,7 @@ LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe
 
 MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME}
 
-LAUNCH_MAKENSIS=/cygdrive/c/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi
+LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi
 
 default: allinone
 
@@ -27,8 +27,8 @@ server_clean:
 	rm -rf $(SERVER_DIRECTORY)/.cyg*
 
 allinone: server_clean
-	(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE))
-	(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE))
+	#(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE))
+	#(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE))
 	(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS))
 	(cd $(SERVER_DIRECTORY)/setup/win32 && mkdir -p $(FILES_DIRECTORY))
 	(cd $(SERVER_DIRECTORY)/setup/win32 && cp openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe)
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 8a70867e602..10dbc9e52d8 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -41,7 +41,7 @@
 !define PUBLISHER 'Odoo S.A.'

 

 !ifndef MAJOR_VERSION

-    !define MAJOR_VERSION '10'

+    !define MAJOR_VERSION '11'

 !endif

 

 !ifndef MINOR_VERSION

@@ -49,7 +49,7 @@
 !endif

 

 !ifndef REVISION_VERSION

-    !define REVISION_VERSION '0'

+    !define REVISION_VERSION 'alpha1'

 !endif

 

 !ifndef VERSION

@@ -76,11 +76,11 @@
 Name '${DISPLAY_NAME}'

 Caption "${PRODUCT_NAME} ${VERSION} Setup"

 OutFile "openerp-allinone-setup-${VERSION}.exe"

-#SetCompressor /final /solid lzma

+SetCompressor /FINAL lzma

 #SetCompress auto

 ShowInstDetails show

 

-XPStyle on

+#XPStyle on

 

 InstallDir "$PROGRAMFILES\Odoo ${VERSION}"

 InstallDirRegKey HKCU "${REGISTRY_KEY}" ""

@@ -116,7 +116,7 @@ Var HWNDPostgreSQLPassword
 

 !define STATIC_PATH "static"

 !define PIXMAPS_PATH "${STATIC_PATH}\pixmaps"

-!define POSTGRESQL_EXE_FILENAME "postgresql-9.5.4-2-windows.exe"

+!define POSTGRESQL_EXE_FILENAME "postgresql-9.5.8-1-windows.exe"

 !define POSTGRESQL_EXE "${STATIC_PATH}\${POSTGRESQL_EXE_FILENAME}"

 

 !define MUI_ABORTWARNING

@@ -205,14 +205,20 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     SectionIn 1 2

 

     # TODO: install in a temp dir before

+    

+    # Installing winpython

+    SetOutPath "$INSTDIR\python"

+    File /r /x "__pycache__" "..\..\..\WinPython\python-3.6.2\*"

+

+    SetOutPath "$INSTDIR\nssm"

+    File /r /x "src" "..\..\..\nssm-2.24\*"

 

     SetOutPath "$INSTDIR\server"

-    File /r "..\..\dist\*"

+    File /r /x "${POSTGRESQL_EXE_FILENAME}" /x "wkhtmltopdf" "..\..\*"

 

-    SetOutPath "$INSTDIR\service"

-    File /r "dist\*"

-    File "start.bat"

-    File "stop.bat"

+    # Install Visual C redistribuable files

+    DetailPrint "Installing Visual C++ redistributable files"

+    nsExec::Exec '"$INSTDIR\service\vcredist\vcredist_x86.exe" /q'

 

     SetOutPath "$INSTDIR\thirdparty"

     File /r "${STATIC_PATH}\wkhtmltopdf\*"

@@ -233,9 +239,11 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
         WriteIniStr "$INSTDIR\server\odoo.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"

     ${EndIf}

 

-    nsExec::Exec '"$INSTDIR\server\odoo-bin.exe" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'

-    nsExec::Exec '"$INSTDIR\service\win32_service.exe" -auto -install'

-

+    DetailPrint "Installing Windows service"

+    nsExec::ExecTOLog '"$INSTDIR\python\python.exe" "$INSTDIR\server\odoo-bin" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'

+    nsExec::ExecToLog '"$INSTDIR\nssm\win32\nssm.exe" install ${SERVICENAME} "$INSTDIR\python\python.exe" "\"$INSTDIR\server\odoo-bin\""'

+    nsExec::ExecToLog '"$INSTDIR\nssm\win32\nssm.exe" set AppDirectory "$\"$INSTDIR\server$\""'

+    

     nsExec::Exec "net stop ${SERVICENAME}"

     sleep 2

 

@@ -298,13 +306,14 @@ Section "Uninstall"
     ReadRegStr $0 HKLM "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"

     ExecWait '"$0" /S'

 

-    nsExec::Exec "net stop odoo-server-9.0"

-    nsExec::Exec "sc delete odoo-server-9.0"

+    nsExec::Exec "net stop ${SERVICENAME}"

+    nsExec::Exec "sc delete ${SERVICENAME}"

     sleep 2

 

     Rmdir /r "$INSTDIR\server"

-    Rmdir /r "$INSTDIR\service"

     Rmdir /r "$INSTDIR\thirdparty"

+    Rmdir /r "$INSTDIR\python"

+    Rmdir /r "$INSTDIR\nssm"

     DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"

 SectionEnd

 

diff --git a/setup/win32/win32_service.py b/setup/win32/win32_service.py
deleted file mode 100644
index 8eb32bbdbb6..00000000000
--- a/setup/win32/win32_service.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import servicemanager
-import win32api
-import win32process
-import win32service
-import win32serviceutil
-
-import subprocess
-import sys
-from os.path import dirname, join, split
-
-
-exec(open(join(dirname(__file__), '..', 'server', 'odoo', 'release.py'), 'rb').read())
-
-
-class OdooService(win32serviceutil.ServiceFramework):
-    _svc_name_ = nt_service_name
-    _svc_display_name_ = "%s %s" % (nt_service_name, serie)
-
-    def __init__(self, args):
-        win32serviceutil.ServiceFramework.__init__(self, args)
-        self.odooprocess = None  # Reference to the server's process
-
-    def SvcStop(self):
-        # Before we do anything, tell the SCM we are starting the stop process.
-        self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-        # Stop the running Odoo: say it's a normal exit
-        win32api.TerminateProcess(int(self.odooprocess._handle), 0)
-        servicemanager.LogInfoMsg("Odoo stopped correctly")
-
-    def SvcDoRun(self):
-        # We start Odoo as an independent process, but we keep its handle
-        service_dir = dirname(sys.argv[0])
-        server_dir = split(service_dir)[0]
-        server_path = join(server_dir, 'server', 'odoo-bin.exe')
-        self.odooprocess = subprocess.Popen(
-            [server_path], cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW
-        )
-        servicemanager.LogInfoMsg('Odoo up and running')
-        # exit with same exit code as Odoo process
-        sys.exit(self.odooprocess.wait())
-
-
-def option_handler(opts):
-    # configure the service to auto restart on failures...
-    subprocess.call([
-        'sc', 'failure', nt_service_name, 'reset=', '0', 'actions=', 'restart/0/restart/0/restart/0'
-    ])
-
-
-if __name__ == '__main__':
-    win32serviceutil.HandleCommandLine(OdooService, customOptionHandler=option_handler)
diff --git a/setup/win32/win32_setup.py b/setup/win32/win32_setup.py
deleted file mode 100644
index a61081760d0..00000000000
--- a/setup/win32/win32_setup.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import glob
-import py2exe
-from distutils.core import setup
-
-
-exec(open(os.path.join(os.path.dirname(__file__), '..', '..', 'odoo', 'release.py'), 'rb').read())
-
-
-def generate_files():
-    actions = {
-        'start': ['stop', 'start'],
-        'stop': ['stop'],
-    }
-
-    files = []
-    if os.name == 'nt':
-        files.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
-    for action, steps in actions.items():
-        fname = action + '.bat'
-        files.append(fname)
-        with open(fname, 'w') as fp:
-            fp.write('@PATH=%WINDIR%\system32;%WINDIR%;%WINDIR%\System32\Wbem;.\n')
-            for step in steps:
-                fp.write('@net %s %s\n' % (step, nt_service_name))
-    return files
-
-setup(
-    service=["win32_service"],
-    version=version,
-    license=license,
-    url=url,
-    author=author,
-    author_email=author_email,
-    data_files=generate_files(),
-    options={
-        "py2exe": {
-            "excludes": [
-                'Tkconstants',
-                'Tkinter',
-                'tcl',
-                '_imagingtk',
-                'PIL._imagingtk',
-                'ImageTk',
-                'PIL.ImageTk',
-                'FixTk'
-            ],
-            "skip_archive": 1,
-            "optimize": 2,
-        }
-    },
-)
diff --git a/setup/win32/winpy_requirements.txt b/setup/win32/winpy_requirements.txt
new file mode 100644
index 00000000000..458473815ec
--- /dev/null
+++ b/setup/win32/winpy_requirements.txt
@@ -0,0 +1,40 @@
+Babel==2.3.4
+decorator==4.0.10
+docutils==0.12
+ebaysdk==2.1.4
+feedparser==5.2.1
+gevent>=1.1.2
+greenlet>=0.4.10
+html2text==2016.9.19
+Jinja2==2.8
+lxml>=3.5.0
+Mako==1.0.4
+MarkupSafe==0.23
+mock==2.0.0
+num2words==0.5.4
+ofxparse==0.16
+passlib==1.6.5
+Pillow>=3.4.1
+psutil>=4.3.1
+psycopg2==2.7.1
+pydot==1.2.3
+pyldap>=2.4.28
+pyparsing==2.1.10
+PyPDF2==1.26.0
+pyserial==3.1.1
+python-dateutil==2.5.3
+python-openid==2.2.5
+pytz==2016.7
+pyusb==1.0.0
+PyYAML==3.12
+qrcode==5.3
+reportlab>=3.3.0
+requests==2.11.1
+six==1.10.0
+suds-jurko==0.6
+vatnumber==1.2
+vobject==0.9.3
+Werkzeug>=0.11.11
+XlsxWriter==0.9.3
+xlwt==1.3.*
+xlrd==1.0.0