Bug 1247168 - Upgrade to pip 8.1.2 and setuptools 24.0.3 in decision image; r?dustin
Before I update this image to change VCS interactions, I thought I'd
bloat scope to update some Python packaging versions.
I dropped the virtualenv package because AFAICT nobody is using it.
In fact, there are a number of things in the decision image I don't
think should belong. Curious.
MozReview-Commit-ID: 71c35U9ds07
--- a/testing/docker/decision/system-setup.sh
+++ b/testing/docker/decision/system-setup.sh
@@ -28,17 +28,16 @@ apt-get install -y --force-yes --no-inst
libsqlite3-dev \
libssl-dev \
libtinfo-dev \
make \
mime-support \
netbase \
net-tools \
python-dev \
- python-pip \
python-crypto \
python-mox3 \
python-pil \
python-ply \
quilt \
tar \
tk-dev \
xz-utils \
@@ -71,71 +70,47 @@ EOF
cd Python-2.7.10
./configure --prefix /usr/local/lib/python2.7.10
make -j$(nproc)
make install
PATH=/usr/local/lib/python2.7.10/bin/:$PATH
python --version
-# Enough python utilities to get "peep" working
+# Python packaging tools
cd $BUILD
tooltool_fetch <<'EOF'
[
{
- "size": 630700,
- "digest": "1367f3a10c1fef2f8061e430585f1927f6bd7c416e764d65cea1f4255824d549efa77beef8ff784bbd62c307b4b1123502e7b3fd01a243c0cc5b433a841cc8b5",
+ "size": 1140573,
+ "digest": "f35e70344bc7baa0739d7a8a38e51f401774b23672e915c32d54fab3e9cc465bfc47361823fa75d2a64fc8748f2020170bd7a4cfde10070d7febf56d1f9124f0",
"algorithm": "sha512",
- "filename": "setuptools-18.1.tar.gz",
- "unpack": true
+ "filename": "pip-8.1.2.tar.gz"
},
{
- "size": 1051205,
- "digest": "e7d2e003ec60fce5a75a6a23711d7f9b155e898faebcf55f3abdd912ef513f4e0cf43daca8f9da7179a7a4efe6e4a625a532d051349818847df1364eb5b326de",
+ "size": 608585,
+ "digest": "b591b68fd9dbc6c76d54a4a05b08de6a82bdb6ca8ce1fafd717e5f7e6152207ecadd7f8478f237f8392797fc1f74bae36db5becb69801a972d0bc1aeb56dcf7d",
"algorithm": "sha512",
- "filename": "pip-6.1.1.tar.gz",
- "unpack": true
-},
-{
- "size": 26912,
- "digest": "9d730ed7852d4d217aaddda959cd5f871ef1b26dd6c513a3780bbb04a5a93a49d6b78e95c2274451a1311c10cc0a72755b269dc9af62640474e6e73a1abec370",
- "algorithm": "sha512",
- "filename": "peep-2.4.1.tar.gz",
- "unpack": false
+ "filename": "setuptools-24.0.3.tar.gz"
}
]
EOF
-cd $BUILD
-cd setuptools-18.1
+cd $BUILD/setuptools-24.0.3
python setup.py install
-# NOTE: latest peep is not compatible with pip>=7.0
-# https://github.com/erikrose/peep/pull/94
-cd $BUILD
-cd pip-6.1.1
+cd $BUILD/pip-8.1.2
python setup.py install
cd $BUILD
-pip install peep-2.4.1.tar.gz
-
-# Peep (latest)
-cd $BUILD
-pip install peep
-
-# remaining Python utilities are installed with `peep` from upstream
-# repositories; peep verifies file integrity for us
cat >requirements.txt <<'EOF'
-# sha256: 90pZQ6kAXB6Je8-H9-ivfgDAb6l3e5rWkfafn6VKh9g
-virtualenv==13.1.2
-
-# sha256: wJnELXTi1SC2HdNyzZlrD6dgXAZheDT9exPHm5qaWzA
-mercurial==3.7.3
+Mercurial==3.7.3 \
+ --hash=sha256:c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30
EOF
-peep install -r requirements.txt
+pip install --require-hashes -r requirements.txt
# Install node
tooltool_fetch <<'EOF'
[
{
"size": 5676610,
"digest": "ce27b788dfd141a5ba7674332825fc136fe2c4f49a319dd19b3a87c8fffa7a97d86cbb8535661c9a68c9122719aa969fc6a8c886458a0df9fc822eec99ed130b",
"algorithm": "sha512",