[IMP] setup: Update docker files

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. <[email protected]>
 
 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

setup/package.dffedora

@@ -1,38 +1,53 @@
 # 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. <[email protected]>
 
 # 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-psycogreen \
+	  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 +56,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

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. <[email protected]>
 
 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

setup/package.py

@@ -431,10 +431,10 @@ def options():
     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/win1034/win10.qcow2', help="%default")
-    op.add_option("", "--vm-winxp-ssh-key", default='/home/odoo/vm/win1034/id_rsa', help="%default")
+    op.add_option("", "--vm-winxp-image", default='/home/odoo/vm/win1035/win10_py35.qcow2', help="%default")
+    op.add_option("", "--vm-winxp-ssh-key", default='/home/odoo/vm/win1035/id_rsa', help="%default")
     op.add_option("", "--vm-winxp-login", default='Naresh', help="Windows login (%default)")
-    op.add_option("", "--vm-winxp-python-version", default='3.4', help="Windows Python version installed in the VM (default: %default)")
+    op.add_option("", "--vm-winxp-python-version", default='3.5', help="Windows Python version installed in the VM (default: %default)")
     op.add_option("", "--no-remove", action="store_true", help="don't remove build dir")
 
     (o, args) = op.parse_args()