diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/odoo-wsgi.example.py | 2 | ||||
| -rw-r--r-- | setup/package.dfdebian | 3 | ||||
| -rw-r--r-- | setup/package.dffedora | 3 | ||||
| -rw-r--r-- | setup/package.dfsrc | 2 | ||||
| -rwxr-xr-x | setup/package.py | 7 | ||||
| -rw-r--r-- | setup/win32/Makefile | 6 | ||||
| -rwxr-xr-x | setup/win32/setup.nsi | 2 | ||||
| -rw-r--r-- | setup/win32/winpy_requirements.txt | 1 |
8 files changed, 16 insertions, 10 deletions
diff --git a/setup/odoo-wsgi.example.py b/setup/odoo-wsgi.example.py index 7bc9c7f95e5..58b0d12653f 100644 --- a/setup/odoo-wsgi.example.py +++ b/setup/odoo-wsgi.example.py @@ -20,7 +20,7 @@ import odoo odoo.multi_process = True # Nah! # Equivalent of --load command-line option -odoo.conf.server_wide_modules = ['web'] +odoo.conf.server_wide_modules = ['base', 'web'] conf = odoo.tools.config # Path to the OpenERP Addons repository (comma-separated for diff --git a/setup/package.dfdebian b/setup/package.dfdebian index f99d6552b7c..51f97b060ad 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -17,7 +17,6 @@ RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ apt-get install \ adduser \ - node-less \ postgresql \ postgresql-client \ python3 \ @@ -30,6 +29,7 @@ RUN apt-get update -qq && \ python3-html2text \ python3-pil \ python3-jinja2 \ + python3-libsass \ python3-lxml \ python3-mako \ python3-mock \ @@ -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 c6273c6e6ff..f1d000f9244 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -7,7 +7,6 @@ MAINTAINER Odoo S.A. <info@odoo.com> RUN dnf update -d 0 -e 0 -y && \ dnf install -d 0 -e 0 \ babel \ - nodejs-less \ pychart \ pyparsing \ python3-babel \ @@ -35,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 \ @@ -46,6 +44,7 @@ RUN dnf update -d 0 -e 0 -y && \ python3-werkzeug \ python3-xlwt \ python3-xlrd \ + libsass \ pytz \ postgresql \ postgresql-server \ diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 0f23aea4f5b..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 \ - node-less \ + 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/Makefile b/setup/win32/Makefile index 06d7dc9e84d..3644d7fe0db 100644 --- a/setup/win32/Makefile +++ b/setup/win32/Makefile @@ -8,6 +8,7 @@ FILES_DIRECTORY=release MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME} LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi +WINPY_DIR=/cygdrive/c/odoobuild/WinPython/python-3.6.2 default: allinone @@ -24,6 +25,11 @@ server_clean: rm -rf $(SERVER_DIRECTORY)/.cyg* allinone: server_clean + cp $(SERVER_DIRECTORY)/requirements.txt $(WINPY_DIR)/ + -(cd $(WINPY_DIR) && ./python.exe -m pip install --upgrade pip) + -(cd $(WINPY_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC}" ; done) + -(cd $(WINPY_DIR) && Scripts/pip3.exe freeze) + rm $(WINPY_DIR)/requirements.txt (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 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 |