diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfdebian | 1 | ||||
| -rw-r--r-- | setup/package.dffedora | 1 | ||||
| -rw-r--r-- | setup/package.dfsrc | 2 | ||||
| -rwxr-xr-x | setup/package.py | 7 | ||||
| -rwxr-xr-x | setup/win32/setup.nsi | 2 | ||||
| -rw-r--r-- | setup/win32/winpy_requirements.txt | 1 |
6 files changed, 7 insertions, 7 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 82a70dd8dce..51f97b060ad 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -50,7 +50,6 @@ RUN apt-get update -qq && \ 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 1ee83e0767d..f1d000f9244 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -34,7 +34,6 @@ RUN dnf update -d 0 -e 0 -y && \ python3-dateutil \ python3-pytz \ python3-pyusb \ - python3-PyYAML \ python3-qrcode \ python3-reportlab \ python3-requests \ diff --git a/setup/package.dfsrc b/setup/package.dfsrc index d4f424a041f..5b106923047 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -20,7 +20,7 @@ RUN apt-get update -qq && \ postgresql-server-dev-all \ postgresql-client \ adduser \ - libsass \ + libsass0 \ libxml2-dev \ libxslt1-dev \ libldap2-dev \ diff --git a/setup/package.py b/setup/package.py index dd15b84e224..1954a20b33e 100755 --- a/setup/package.py +++ b/setup/package.py @@ -75,13 +75,16 @@ def system(l, chdir=None): def _rpc_count_modules(addr='http://127.0.0.1', port=8069, dbname='mycompany'): time.sleep(5) + uid = xmlrpclib.ServerProxy('%s:%s/xmlrpc/common' % (addr, port)).authenticate( + dbname, 'admin', 'admin', {} + ) modules = xmlrpclib.ServerProxy('%s:%s/xmlrpc/object' % (addr, port)).execute( - dbname, 1, 'admin', 'ir.module.module', 'search', [('state', '=', 'installed')] + dbname, uid, 'admin', 'ir.module.module', 'search', [('state', '=', 'installed')] ) if modules and len(modules) > 1: time.sleep(1) toinstallmodules = xmlrpclib.ServerProxy('%s:%s/xmlrpc/object' % (addr, port)).execute( - dbname, 1, 'admin', 'ir.module.module', 'search', [('state', '=', 'to install')] + dbname, uid, 'admin', 'ir.module.module', 'search', [('state', '=', 'to install')] ) if toinstallmodules: logging.error("Package test: FAILED. Not able to install dependencies of base.") diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi index 948c0486905..ec602fbfa3d 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 '11'
+ !define MAJOR_VERSION '12'
!endif
!ifndef MINOR_VERSION
diff --git a/setup/win32/winpy_requirements.txt b/setup/win32/winpy_requirements.txt index f998d871af2..b2978d32134 100644 --- a/setup/win32/winpy_requirements.txt +++ b/setup/win32/winpy_requirements.txt @@ -25,7 +25,6 @@ pyserial==3.1.1 python-dateutil==2.5.3 pytz==2016.7 pyusb==1.0.0 -PyYAML==3.12 qrcode==5.3 reportlab>=3.3.0 requests==2.20.0 |