Merge pull request #40 from david-caro/fix_six_import

fix: pin setuptools version due to bad import
inspirehep · Jun 1, 2017 · 29f3243 · 29f3243
2 parents bd66100 + 2dd5926
commit 29f3243
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python_base/Dockerfile b/python_base/Dockerfile
@@ -60,7 +60,7 @@ ENV INSPIRE_PYTHON_VERSION ${INSPIRE_PYTHON_VERSION:-2.7}
 RUN virtualenv -v /tmpvenv -p python${INSPIRE_PYTHON_VERSION} && \
  . /tmpvenv/bin/activate && \
  pip install --upgrade pip && \
- pip install --upgrade setuptools wheel && \
+ pip install --upgrade 'setuptools<36' wheel && \
  pip install --upgrade requirements-builder && \
  cd /tmp && \
  wget -q https://raw.githubusercontent.com/inspirehep/inspire-next/master/requirements.txt && \

diff --git a/python_base/docker_entrypoint.sh b/python_base/docker_entrypoint.sh
@@ -64,7 +64,7 @@ prepare_venv() {
  virtualenv "$VENV_PATH" -p "python${INSPIRE_PYTHON_VERSION}"
  source "$VENV_PATH"/bin/activate
  pip install --upgrade pip
- pip install --upgrade setuptools wheel
+ pip install --upgrade 'setuptools<36' wheel
  cp -r /src-cache "$VENV_PATH"/src
 }