From 6a1e0d27cc9512a8b6c98e7bfa9954304656c34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 11 May 2016 15:53:59 +0200 Subject: [PATCH] Fix the version of pip and setuptools --- Makefile | 2 +- c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4d980147fa..5e8390c235 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ c2cgeoportal/locale/en/LC_MESSAGES/c2cgeoportal.po: c2cgeoportal/locale/c2cgeopo virtualenv --setuptools --no-site-packages .build/venv $(PIP_CMD) install \ --index-url http://pypi.camptocamp.net/pypi \ - 'pip>=7' 'setuptools>=12' $(PIP_REDIRECT) + 'pip==7.1.2' 'setuptools==21.0.0' $(PIP_REDIRECT) touch $@ .build/requirements.timestamp: .build/venv.timestamp setup.py \ diff --git a/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl b/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl index ab929535d1..ccc3e5a2d2 100644 --- a/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl +++ b/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl @@ -20,8 +20,8 @@ PRINT_VERSION ?= 3 PIP_CMD ?= $(VENV_BIN)/pip PIP_INSTALL_ARGS += install --trusted-host pypi.camptocamp.net -PIP_VERSION ?= pip>=7,<8 -SETUPTOOL_VERSION ?= setuptools>=12 +PIP_VERSION ?= pip==7.1.2 +SETUPTOOL_VERSION ?= setuptools==21.0.0 GIT_MODULES_FOLDER ?= .git/modules/