python: use pip instead of python setup.py

python setup.py develop may try to pull dependencies from the net and
has no way to collect them from the wheelhouse that was populated by
install-deps.sh. Use pip install -e instead

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 45196a54b88078b5cd8d7023c2ba5f7076812947..ccc9def9d926d11b02b97d5cf7b3cf6d19003612 100644 (file)
--- a/src/ceph-detect-init/Makefile.am
+++ b/src/ceph-detect-init/Makefile.am
@@ -56,7 +56,7 @@ EXTRA_DIST += \
 ceph-detect-init-all: ceph-detect-init/virtualenv
 
 ceph-detect-init/virtualenv:
-       cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ; virtualenv/bin/python setup.py develop
+       cd $(srcdir)/ceph-detect-init ; ../tools/setup-virtualenv.sh ; test -d wheelhouse && export NO_INDEX=--no-index ; virtualenv/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
 
 ceph-detect-init-clean:
        cd $(srcdir)/ceph-detect-init ; python setup.py clean ; rm -fr wheelhouse .tox virtualenv .coverage *.egg-info

diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
index a0f68dee174ead62aa6b2b39c8948f763e9b8c2a..7e4947fe03861dfff771d69ba85907fd33b0d6f8 100644 (file)
--- a/src/ceph-disk/Makefile.am
+++ b/src/ceph-disk/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST += \
 ceph-disk-all: ceph-disk/virtualenv
 
 ceph-disk/virtualenv:
-       cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ; virtualenv/bin/python setup.py develop
+       cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ; test -d wheelhouse && export NO_INDEX=--no-index ; virtualenv/bin/pip install $$NO_INDEX --use-wheel --find-links=file://$$(pwd)/wheelhouse -e .
 
 ceph-disk-clean:
        cd $(srcdir)/ceph-disk ; python setup.py clean ; rm -fr wheelhouse .tox virtualenv .coverage *.egg-info