Skip to content

Commit

Permalink
Use pip development version
Browse files Browse the repository at this point in the history
To prevent unnecessary upgrades of libraries. See
pypa/pip#3972
  • Loading branch information
guewen committed Jan 11, 2018
1 parent 3c1032a commit 9caa632
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion 11.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ RUN set -x; \
libjpeg-dev \
libpng-dev \
zlib1g-dev \
git \
&& curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
Expand All @@ -65,7 +66,7 @@ RUN set -x; \
&& cp -r wkhtmltox/share/man/man1 /usr/local/share/man/ \
&& apt-get -y install -f --no-install-recommends \
&& pip3 install -U pip && pip3 install wheel && pip3 install -r base_requirements.txt --ignore-installed \
&& apt-get remove -y build-essential gcc python3.5-dev libevent-dev libfreetype6-dev libpq-dev libxml2-dev libxslt1-dev \
&& apt-get remove -y build-essential gcc python3.5-dev libevent-dev libfreetype6-dev libpq-dev libxml2-dev libxslt1-dev git \
libsasl2-dev libldap2-dev libssl-dev libjpeg-dev libpng-dev zlib1g-dev \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false \
&& ln -s $(which pip3) /usr/bin/pip \
Expand Down
5 changes: 5 additions & 0 deletions 11.0/base_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# the latest released version of pip might upgrade too much libs
# see https://github.com/pypa/pip/pull/4500/
# the development version will upgrade only if needed
git+https://github.com/pypa/pip.git#egg=pip

# Odoo dependencies
Babel==2.3.4
decorator==4.0.10
Expand Down

0 comments on commit 9caa632

Please sign in to comment.