Skip to content

Commit

Permalink
OPS-1637: Upgrade pip, setuptools, virtualenv
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Rothman committed Jul 19, 2016
1 parent 3e010c2 commit bbc1a23
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions playbooks/roles/common_vars/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ common_debian_pkgs:
- python2.7-dev

common_pip_pkgs:
- pip==7.1.2
- setuptools==18.3.2
- virtualenv==13.1.2
- pip==8.1.2
- setuptools==24.0.3
- virtualenv==15.0.2
- virtualenvwrapper==4.7.1

common_web_user: www-data
Expand Down
2 changes: 1 addition & 1 deletion pre-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pip==7.1.2
pip==8.1.2
6 changes: 3 additions & 3 deletions util/install/ansible-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ fi
#
# Bootstrapping constants
#
VIRTUAL_ENV_VERSION="13.1.2"
PIP_VERSION="7.1.2"
SETUPTOOLS_VERSION="18.3.2"
VIRTUAL_ENV_VERSION="15.0.2"
PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="24.0.3"
VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN="${VIRTUAL_ENV}/bin"
ANSIBLE_DIR="/tmp/ansible"
Expand Down
6 changes: 3 additions & 3 deletions util/install/sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ sudo apt-get upgrade -y
## Install system pre-requisites
##
sudo apt-get install -y build-essential software-properties-common curl git-core libxml2-dev libxslt1-dev python-pip libmysqlclient-dev python-apt python-dev libxmlsec1-dev libfreetype6-dev swig gcc-4.8 g++-4.8
sudo pip install --upgrade pip==7.1.2
sudo pip install --upgrade setuptools==18.3.2
sudo -H pip install --upgrade virtualenv==13.1.2
sudo pip install --upgrade pip==8.1.2
sudo pip install --upgrade setuptools==24.0.3
sudo -H pip install --upgrade virtualenv==15.0.2

##
## Update alternatives so that gcc/g++ 4.8 is the default compiler
Expand Down
2 changes: 1 addition & 1 deletion util/vpc-tools/abbey.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def create_instance_args():
/usr/bin/apt-get install -y python-httplib2 --force-yes
# upgrade setuptools early to avoid no distributin errors
pip install --upgrade setuptools==18.3.2
pip install --upgrade setuptools==24.0.3
rm -rf $base_dir
mkdir -p $base_dir
Expand Down

0 comments on commit bbc1a23

Please sign in to comment.