Skip to content

Commit 6728719

Browse files
committed
ref(*): disable pip version check and caching
The constant reminders that pip has a new version are not helpful to our build process, and some python libraries were being inadvertently cached at /root/.cache/ inside Docker images.
1 parent 1c9d34c commit 6728719

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

client/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
build: setup-venv
3-
venv/bin/pip install -r requirements.txt git+https://github.com/pyinstaller/pyinstaller@32bbb954b355937ccfe377afbe56979db79a7b30
3+
venv/bin/pip install --disable-pip-version-check -r requirements.txt git+https://github.com/pyinstaller/pyinstaller@32bbb954b355937ccfe377afbe56979db79a7b30
44
venv/bin/pyinstaller deis.spec
55
chmod +x dist/deis
66

@@ -31,7 +31,7 @@ setup-venv:
3131
@if [ ! -d venv ]; then virtualenv venv; fi
3232

3333
test-style: setup-venv
34-
venv/bin/pip install -q flake8==2.4.0
34+
venv/bin/pip install --disable-pip-version-check -q flake8==2.4.0
3535
venv/bin/flake8
3636

3737
test-unit:

contrib/util/add_server_dev_deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "which coverage > /dev/null" | ./dshell deis-controller
66
if [ $? -ne 0 ]; then
77
cat <<-EOF | ./dshell deis-controller
88
cd /app
9-
pip install -r dev_requirements.txt
9+
pip install --disable-pip-version-check -r dev_requirements.txt
1010
EOF
1111
else
1212
echo "Deis server development dependencies already installed."

controller/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test: test-unit test-functional
6969

7070
setup-venv:
7171
@if [ ! -d venv ]; then virtualenv venv; fi
72-
venv/bin/pip install -q -r requirements.txt -r dev_requirements.txt
72+
venv/bin/pip install --disable-pip-version-check -q -r requirements.txt -r dev_requirements.txt
7373

7474
test-style: setup-venv
7575
venv/bin/flake8

controller/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mkdir -p /app && chown -R deis:deis /app
3636
mkdir -p /templates && chown -R deis:deis /templates
3737

3838
# install dependencies
39-
pip install -r /app/requirements.txt
39+
pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
4040

4141
# cleanup.
4242
apk del --purge \

database/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ git clone https://github.com/wal-e/wal-e.git
4141
cd /tmp/wal-e
4242
git checkout c6dd4b1
4343

44-
pip install . oslo.config>=1.12.0
44+
pip install --disable-pip-version-check --no-cache-dir . oslo.config>=1.12.0
4545

4646
# python port of daemontools
47-
pip install envdir
47+
pip install --disable-pip-version-check --no-cache-dir envdir
4848

4949
mkdir -p /etc/wal-e.d/env /etc/postgresql/main /var/lib/postgresql
5050

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ server: dirhtml
6969

7070
test: clean
7171
@if [ ! -d venv ]; then virtualenv venv; fi
72-
venv/bin/pip install -q -r docs_requirements.txt
72+
venv/bin/pip install --disable-pip-version-check -q -r docs_requirements.txt
7373
venv/bin/$(SPHINXBUILD) -b dirhtml -N $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
7474
grep -q \<h1\>Welcome _build/dirhtml/index.html || exit 1
7575
@echo

registry/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apk add --update-cache \
2525
curl -sSL https://raw.githubusercontent.com/pypa/pip/7.0.3/contrib/get-pip.py | python -
2626

2727
# workaround to python > 2.7.8 SSL issues
28-
pip install pyopenssl ndg-httpsclient pyasn1
28+
pip install --disable-pip-version-check --no-cache-dir pyopenssl ndg-httpsclient pyasn1
2929

3030
# create a registry user
3131
adduser -D -s /bin/bash registry
@@ -36,13 +36,13 @@ git clone -b new-repository-import-v091 --single-branch https://github.com/deis/
3636

3737
# install boto configuration
3838
cp /docker-registry/config/boto.cfg /etc/boto.cfg
39-
cd /docker-registry && pip install -r requirements/main.txt
39+
cd /docker-registry && pip install --disable-pip-version-check --no-cache-dir -r requirements/main.txt
4040

4141
# Install core
42-
pip install /docker-registry/depends/docker-registry-core
42+
pip install --disable-pip-version-check --no-cache-dir /docker-registry/depends/docker-registry-core
4343

4444
# Install registry
45-
pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]
45+
pip install --disable-pip-version-check --no-cache-dir file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]
4646

4747
patch \
4848
$(python -c 'import boto; import os; print os.path.dirname(boto.__file__)')/connection.py \

tests/bin/test-integration-ec2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID?}
1818
export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY?}
1919

2020
# install python requirements for this script
21-
pip install awscli boto docopt
21+
pip install --disable-pip-version-check awscli boto docopt
2222

2323
function cleanup_ec2 {
2424
if [ "$SKIP_CLEANUP" != true ]; then

0 commit comments

Comments
 (0)