Commit 78406b8a by Jeremy Bowman Committed by Ned Batchelder

Upgrade setuptools, pip, and virtualenv

(cherry picked from commit 2cc32cff)
parent e1dfcae1
......@@ -58,13 +58,13 @@ RUN printf "\ngo ALL=(ALL:ALL) NOPASSWD: /usr/bin/pip3, /usr/local/bin/pip3
# Upgrade pip and setup tools. Needed for Ansible 2.x
RUN \
pip install --upgrade pip==8.1.2 && \
pip3 install --upgrade pip==8.1.2 && \
pip install --upgrade pip==9.0.3 && \
pip3 install --upgrade pip==9.0.3 && \
#pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
hash -r && \
# upgrade setuptools early to avoid no distribution errors
pip install --upgrade setuptools==24.0.3 && \
pip3 install --upgrade setuptools==24.0.3
pip install --upgrade setuptools==39.0.1 && \
pip3 install --upgrade setuptools==39.0.1
# Install AWS command-line interface - for AWS operations in a go-agent task.
......
......@@ -125,10 +125,10 @@ old_python_debian_pkgs:
- "python2.7=2.7.10-0+{{ ansible_distribution_release }}1"
common_pip_pkgs:
- pip==8.1.2
- setuptools==24.0.3
- virtualenv==15.0.2
- virtualenvwrapper==4.7.1
- pip==9.0.3
- setuptools==39.0.1
- virtualenv==15.2.0
- virtualenvwrapper==4.8.2
common_web_user: www-data
common_web_group: www-data
......
......@@ -40,9 +40,9 @@ fi
#
# Bootstrapping constants
#
VIRTUAL_ENV_VERSION="15.0.2"
PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="24.0.3"
VIRTUAL_ENV_VERSION="15.2.0"
PIP_VERSION="9.0.3"
SETUPTOOLS_VERSION="39.0.1"
VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN="${VIRTUAL_ENV}/bin"
ANSIBLE_DIR="/tmp/ansible"
......
......@@ -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 g++
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
sudo pip install --upgrade pip==9.0.3
sudo pip install --upgrade setuptools==39.0.1
sudo -H pip install --upgrade virtualenv==15.2.0
##
## Overridable version variables in the playbooks. Each can be overridden
......
......@@ -327,9 +327,9 @@ fi
#
# Bootstrapping constants
#
VIRTUAL_ENV_VERSION="15.0.2"
PIP_VERSION="8.1.2"
SETUPTOOLS_VERSION="24.0.3"
VIRTUAL_ENV_VERSION="15.2.0"
PIP_VERSION="9.0.3"
SETUPTOOLS_VERSION="39.0.1"
EDX_PPA="deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment