Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the version of pip and setuptools #2222

Merged
merged 1 commit into from
May 12, 2016
Merged

Fix the version of pip and setuptools #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down