Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
60cadcbb
Unverified
Commit
60cadcbb
authored
Apr 02, 2018
by
Jeremy Bowman
Committed by
GitHub
Apr 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4434 from edx/upgrade_setuptools_and_pip
Upgrade setuptools, pip, and virtualenv
parents
47e5aaa3
2cc32cff
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
docker/build/go-agent/Dockerfile
+4
-4
playbooks/roles/common_vars/defaults/main.yml
+4
-4
util/install/ansible-bootstrap.sh
+3
-3
util/install/sandbox.sh
+3
-3
util/vpc-tools/abbey.py
+3
-3
No files found.
docker/build/go-agent/Dockerfile
View file @
60cadcbb
...
@@ -48,13 +48,13 @@ RUN printf "\ngo ALL=(ALL:ALL) NOPASSWD: /usr/bin/pip3, /usr/local/bin/pip3
...
@@ -48,13 +48,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
# Upgrade pip and setup tools. Needed for Ansible 2.x
RUN
\
RUN
\
pip install
--upgrade
pip
==
8.1.2
&&
\
pip install
--upgrade
pip
==
9.0.3
&&
\
pip3 install
--upgrade
pip
==
8.1.2
&&
\
pip3 install
--upgrade
pip
==
9.0.3
&&
\
#pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
#pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
hash -r && \
hash -r && \
# upgrade setuptools early to avoid no distribution errors
# upgrade setuptools early to avoid no distribution errors
pip install --upgrade setuptools==
24.0.3
&& \
pip install --upgrade setuptools==
39.0.1
&& \
pip3 install --upgrade setuptools==
24.0.3
pip3 install --upgrade setuptools==
39.0.1
# Install AWS command-line interface - for AWS operations in a go-agent task.
# Install AWS command-line interface - for AWS operations in a go-agent task.
...
...
playbooks/roles/common_vars/defaults/main.yml
View file @
60cadcbb
...
@@ -125,10 +125,10 @@ old_python_debian_pkgs:
...
@@ -125,10 +125,10 @@ old_python_debian_pkgs:
-
"
python2.7=2.7.10-0+{{
ansible_distribution_release
}}1"
-
"
python2.7=2.7.10-0+{{
ansible_distribution_release
}}1"
common_pip_pkgs
:
common_pip_pkgs
:
-
pip==
8.1.2
-
pip==
9.0.3
-
setuptools==
24.0.3
-
setuptools==
39.0.1
-
virtualenv==15.
0.2
-
virtualenv==15.
2.0
-
virtualenvwrapper==4.
7.1
-
virtualenvwrapper==4.
8.2
common_web_user
:
www-data
common_web_user
:
www-data
common_web_group
:
www-data
common_web_group
:
www-data
...
...
util/install/ansible-bootstrap.sh
View file @
60cadcbb
...
@@ -40,9 +40,9 @@ fi
...
@@ -40,9 +40,9 @@ fi
#
#
# Bootstrapping constants
# Bootstrapping constants
#
#
VIRTUAL_ENV_VERSION
=
"15.
0.2
"
VIRTUAL_ENV_VERSION
=
"15.
2.0
"
PIP_VERSION
=
"
8.1.2
"
PIP_VERSION
=
"
9.0.3
"
SETUPTOOLS_VERSION
=
"
24.0.3
"
SETUPTOOLS_VERSION
=
"
39.0.1
"
VIRTUAL_ENV
=
"/tmp/bootstrap"
VIRTUAL_ENV
=
"/tmp/bootstrap"
PYTHON_BIN
=
"
${
VIRTUAL_ENV
}
/bin"
PYTHON_BIN
=
"
${
VIRTUAL_ENV
}
/bin"
ANSIBLE_DIR
=
"/tmp/ansible"
ANSIBLE_DIR
=
"/tmp/ansible"
...
...
util/install/sandbox.sh
View file @
60cadcbb
...
@@ -32,9 +32,9 @@ sudo apt-get upgrade -y
...
@@ -32,9 +32,9 @@ sudo apt-get upgrade -y
## Install system pre-requisites
## 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
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
pip
==
9.0.3
sudo
pip install
--upgrade
setuptools
==
24.0.3
sudo
pip install
--upgrade
setuptools
==
39.0.1
sudo
-H
pip install
--upgrade
virtualenv
==
15.
0.2
sudo
-H
pip install
--upgrade
virtualenv
==
15.
2.0
##
##
## Overridable version variables in the playbooks. Each can be overridden
## Overridable version variables in the playbooks. Each can be overridden
...
...
util/vpc-tools/abbey.py
View file @
60cadcbb
...
@@ -327,9 +327,9 @@ fi
...
@@ -327,9 +327,9 @@ fi
#
#
# Bootstrapping constants
# Bootstrapping constants
#
#
VIRTUAL_ENV_VERSION="15.
0.2
"
VIRTUAL_ENV_VERSION="15.
2.0
"
PIP_VERSION="
8.1.2
"
PIP_VERSION="
9.0.3
"
SETUPTOOLS_VERSION="
24.0.3
"
SETUPTOOLS_VERSION="
39.0.1
"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050"
EDX_PPA_KEY_ID="B41E5E3969464050"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment