opendev
/
system-config
Code Issues Proposed changes

Merge "Install python requirements directly"

This commit is contained in:
Zuul 2019-01-22 18:20:58 +00:00 committed by Gerrit Code Review
parent 545921ba7b d3c6bbc7af
commit f731bac396
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/python-builder/scripts/assemble
View File

@ -59,7 +59,14 @@ python -m venv /tmp/venv
/tmp/venv/bin/pip install -U pip wheel
# Install everything so that the wheel cache is populated
# with transitive depends.
# with transitive depends. If a requirements.txt file exists,
# install it directly so that people can use git url syntax
# to do things like pick up patched but unreleased versions
# of dependencies.
if [ -f /tmp/src/requirements.txt ] ; then
/tmp/venv/bin/pip install --cache-dir=/output/wheels -r /tmp/src/requirements.txt
cp /tmp/src/requirements.txt /output/requirements.txt
fi
/tmp/venv/bin/pip install --cache-dir=/output/wheels /output/wheels/*whl
# Install each of the extras so that we collect all possibly

7
docker/python-builder/scripts/install-from-bindep
View File

@ -18,6 +18,13 @@ set -e
apt-get update
apt-get -y install $(cat /output/bindep/run.txt)
# If a requirements.txt file exists,
# install it directly so that people can use git url syntax
# to do things like pick up patched but unreleased versions
# of dependencies.
if [ -f /output/requirements.txt ] ; then
pip install --cache-dir=/output/wheels -r /output/requirements.txt
fi
pip install --cache-dir=/output/wheels /output/wheels/*.whl
# clean up after ourselves