diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-01-15 11:59:57 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-01-15 15:22:02 +0100 |
| commit | 67959566edc87885ec4b7e31807d48514a7b5944 (patch) | |
| tree | 77f4ad00f86b1a95eac68d16de7a86629dc6f067 /setup | |
| parent | 7530d2818321ce0e71c79a0edc6bb9abc541816f (diff) | |
[FIX] Packaging: Debian Dockerfile for nightly tests
Remove installation of v8 requirements in package.dfdebian as this
is unnecessary for v7. This fixes a bug occuring during the installation
of openerp (precisely when installing reportlab dependencies), because
reportlab now requires a more recent version of pillow than 2.5.1.
Also use pip instead of /usr/local/bin/pip in test_tgz (package.py)
as pip script isn't installed there anymore.
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfdebian | 42 | ||||
| -rwxr-xr-x | setup/package.py | 2 |
2 files changed, 1 insertions, 43 deletions
diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 4995a4150b8..148f5513cee 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -64,45 +64,3 @@ RUN apt-get update -qq && \ python-xlwt \ python-yaml -y && \ rm -rf /var/lib/apt/lists/* - -RUN pip install Babel==1.3 \ - Jinja2==2.7.3 \ - Mako==1.0.0 \ - MarkupSafe==0.23 \ - Pillow==2.5.1 \ - http://download.gna.org/pychart/PyChart-1.39.tar.gz \ - PyYAML==3.11 \ - Werkzeug==0.9.6 \ - argparse==1.2.1 \ - decorator==3.4.0 \ - docutils==0.12 \ - feedparser==5.1.3 \ - gdata==2.0.18 \ - gevent==1.0.1 \ - greenlet==0.4.2 \ - jcconv==0.2.3 \ - lxml==3.3.5 \ - mock==1.0.1 \ - passlib==1.6.2 \ - psutil==2.1.1 \ - psycogreen==1.0 \ - psycopg2==2.5.3 \ - pyPdf==1.13 \ - pydot==1.0.2 \ - pyparsing==1.5.7 \ - pyserial==2.7 \ - python-dateutil==1.5 \ - python-ldap==2.4.15 \ - python-openid==2.2.5 \ - pytz==2014.4 \ - pyusb==1.0.0b1 \ - qrcode==5.0.1 \ - reportlab==3.1.8 \ - requests==2.3.0 \ - simplejson==3.5.3 \ - six==1.7.3 \ - unittest2==0.5.1 \ - vatnumber==1.2 \ - vobject==0.6.6 \ - wsgiref==0.1.2 \ - xlwt==0.7.5 diff --git a/setup/package.py b/setup/package.py index d3d2465beef..779a49902ea 100755 --- a/setup/package.py +++ b/setup/package.py @@ -317,7 +317,7 @@ def test_tgz(o): with docker('openerp-debian-nightly-tests', o.build_dir, o.pub) as wheezy: wheezy.release = 'openerp.tar.gz' wheezy.system("service postgresql start") - wheezy.system('/usr/local/bin/pip install /opt/release/%s' % wheezy.release) + wheezy.system('pip install /opt/release/%s' % wheezy.release) wheezy.system("useradd --system --no-create-home openerp") wheezy.system('su postgres -s /bin/bash -c "createuser -s openerp"') wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') |