From bf3193ac5eff049abcdf92397307b678e533233c Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 13 Mar 2018 14:53:46 +0100
Subject: [PATCH] [REF] setup: review dependencies
Include libsass instead of node-less
Thank you to @d-fence for testing this.
---
debian/control | 3 ++-
requirements.txt | 1 +
setup.cfg | 3 +--
setup/package.dfdebian | 3 ++-
setup/package.dffedora | 2 +-
setup/package.dfsrc | 2 +-
setup/redhat/postinstall.sh | 1 +
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index eb671d05c514..0d697f46f4d5 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 27127c708627..0d0083a95332 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 3994ef225f23..76ec37beeed7 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 f99d6552b7ca..25197f4e0bf4 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 c6273c6e6ff1..1ee83e0767dc 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 0f23aea4f5bc..d4f424a041fb 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 54b1b5cd56f3..1c9df706cd46 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
--
GitLab