summaryrefslogtreecommitdiff
path: root/buildstream
diff options
context:
space:
mode:
authorShahwat Dalal <sdalal29@bloomberg.net>2019-04-23 09:45:21 +0100
committerChandan Singh <chandan@chandansingh.net>2019-05-14 22:50:59 +0000
commit27f4f3b7a2fd22c8c812f0f35b32426afe776444 (patch)
treeb71a7ccd7183f182f35c02efaa6ffd996cbbb98f /buildstream
parentf79351d65c99757ba5f7806e4b0d9c706fca518e (diff)
downloadbuildstream-27f4f3b7a2fd22c8c812f0f35b32426afe776444.tar.gz
pip_element: Install packages pulled by pip_source
In refrence to https://gitlab.com/BuildStream/buildstream/issues/589. `pip.yaml` now installs pip packages from `/.bst_pip_downloads` if the directory exists.
Diffstat (limited to 'buildstream')
-rw-r--r--buildstream/plugins/elements/pip.yaml12
1 files changed, 11 insertions, 1 deletions
diff --git a/buildstream/plugins/elements/pip.yaml b/buildstream/plugins/elements/pip.yaml
index b2b3d3857..294d4ad9a 100644
--- a/buildstream/plugins/elements/pip.yaml
+++ b/buildstream/plugins/elements/pip.yaml
@@ -3,6 +3,14 @@
variables:
pip: pip
+ pip-flags: |
+ %{pip} install --no-deps --root=%{install-root} --prefix=%{prefix}
+ pip-install-package: |
+ %{pip-flags} %{conf-root}
+ pip-download-dir: |
+ .bst_pip_downloads
+ pip-install-dependencies: |
+ if [ -e %{pip-download-dir} ]; then %{pip-flags} %{pip-download-dir}/*; fi
config:
@@ -14,7 +22,9 @@ config:
#
install-commands:
- |
- %{pip} install --no-deps --root=%{install-root} --prefix=%{prefix} %{conf-root}
+ %{pip-install-package}
+ - |
+ %{pip-install-dependencies}
# Commands for stripping debugging information out of
# installed binaries