From 190144926d11e43bcea00645622b726c4001778c Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Tue, 4 Oct 2016 00:42:37 +0800 Subject: [PATCH] Revert "Fix pycparser wheel package issue" the bad pycparser wheel package has beed removed. This reverts commit 195bcd0f4323462b77d025936b898c85ddd8fdb3. Change-Id: I4669a627b68c4bd7534288c4a594a49226db3832 --- docker/kolla-toolbox/Dockerfile.j2 | 4 +--- docker/macros.j2 | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 1793ba6f7f..78b0a6cbde 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -48,13 +48,11 @@ MAINTAINER {{ maintainer }} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} -# TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed. -# [0] https://github.com/eliben/pycparser/issues/147 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ && pip --no-cache-dir install pytz \ - && pip --no-cache-dir install --no-binary pycparser \ + && pip --no-cache-dir install \ ansible==2.1.1.0 \ MySQL-python \ os-client-config==1.16.0 \ diff --git a/docker/macros.j2 b/docker/macros.j2 index c19098e300..32496a9210 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -15,9 +15,5 @@ {% macro install_pip(packages) %} -{#- -TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed. -[0] https://github.com/eliben/pycparser/issues/147 --#} -RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade --no-binary pycparser -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %} +RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %} {% endmacro %}