diff --git a/debian/control b/debian/control index eb671d05c514a974f47c6f5d6b7ae1ace00a6077..0d697f46f4d538e2f90a63f644f67033fe75ac77 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Depends: ${misc:Depends}, ${python3:Depends}, adduser, + libsass, lsb-base, - node-less, postgresql-client, python3-babel, python3-dateutil, @@ -25,6 +25,7 @@ Depends: python3-html2text, python3-pil, python3-jinja2, + python3-libsass, python3-lxml, python3-mako, python3-mock, diff --git a/requirements.txt b/requirements.txt index 27127c708627bfea292b41affa01b698c5aa8445..0d0083a95332afd82f3abb6fdbe8bb9f3fea7e4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ gevent==1.1.2 ; sys_platform != 'win32' greenlet==0.4.10 html2text==2016.9.19 Jinja2==2.8 +libsass==0.12.3 lxml==3.7.1 ; sys_platform != 'win32' lxml ; sys_platform == 'win32' Mako==1.0.4 diff --git a/setup.cfg b/setup.cfg index 3994ef225f2364663d07f67a3c4b2a7cb732d11d..76ec37beeed73eac3595db6bfbfa86f16668e9da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,8 +5,8 @@ post-install = setup/redhat/postinstall.sh requires = babel + libsass libxslt-python - nodejs-less pychart pyparsing python(abi) = 3.6 @@ -48,4 +48,3 @@ requires = python3-werkzeug python3-xlwt python3-xlrd - diff --git a/setup/package.dfdebian b/setup/package.dfdebian index f99d6552b7cad0385f784bae521fc3f56e185331..25197f4e0bf4ce3d9bedf1cd901296da60bbf032 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -17,7 +17,7 @@ RUN apt-get update -qq && \ apt-get upgrade -qq -y && \ apt-get install \ adduser \ - node-less \ + libsass \ postgresql \ postgresql-client \ python3 \ @@ -30,6 +30,7 @@ RUN apt-get update -qq && \ python3-html2text \ python3-pil \ python3-jinja2 \ + python3-libsass \ python3-lxml \ python3-mako \ python3-mock \ diff --git a/setup/package.dffedora b/setup/package.dffedora index c6273c6e6ff1566bc2acfefdf8fc5719578118f5..1ee83e0767dcf67f9986b09779590f738a69c4dc 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 \ @@ -46,6 +45,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 0f23aea4f5bc74d21a96eee90e9b1acda4ba0c89..d4f424a041fbf97515b6809b34a022cdd79cf812 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 \ + libsass \ libxml2-dev \ libxslt1-dev \ libldap2-dev \ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 54b1b5cd56f3cad1e5dd5e09ade184a32f4831e9..1c9df706cd46d415697996ed9b2959d65bf6e435 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -59,3 +59,4 @@ KillMode=mixed [Install] WantedBy=multi-user.target EOF +pip3 install libsass