From: Loic Dachary Date: Thu, 11 Feb 2016 11:47:55 +0000 (+0700) Subject: python: use pip instead of python setup.py X-Git-Tag: v10.1.0~392^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1d8faad2664ce19689c071737ab2f1a78fc134f;p=ceph.git 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 --- diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am index 45196a54b88..ccc9def9d92 100644 --- 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 a0f68dee174..7e4947fe038 100644 --- 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