Merge pull request #2222 from camptocamp/fix-pip

Fix the version of pip and setuptools
camptocamp · May 12, 2016 · c417962 · c417962
2 parents 8fdff1a + 6a1e0d2
commit c417962
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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/