Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luminous: src: s/--use-wheel// #21177

Merged
merged 1 commit into from
Apr 3, 2018

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Apr 2, 2018

--use-wheel was deprecated in favor of --only-binary in pip v7.0.0. and
--use-wheel was removed in a recent release of pip. but some packages
are source packages, so we cannot simply replace use-wheel with
only-binary. so a simpler approach is to drop --use-wheel option, as pip
respects --find-links, and will find the required package from the
wheelhouse.

Signed-off-by: Kefu Chai kchai@redhat.com
(cherry picked from commit a80cce4)

Conflicts:
src/ceph-detect-init/CMakeLists.txt
src/ceph-disk/CMakeLists.txt: trivial resolution
src/pybind/mgr/dashboard/CMakeLists.txt: dashboard2 is not
in luminous, so drop this change.

--use-wheel was deprecated in favor of --only-binary in pip v7.0.0. and
--use-wheel was removed in a recent release of pip. but some packages
are source packages, so we cannot simply replace use-wheel with
only-binary. so a simpler approach is to drop --use-wheel option, as pip
respects --find-links, and will find the required package from the
wheelhouse.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a80cce4)

Conflicts:
	src/ceph-detect-init/CMakeLists.txt
	src/ceph-disk/CMakeLists.txt: trivial resolution
	src/pybind/mgr/dashboard/CMakeLists.txt: dashboard2 is not
in luminous, so drop this change.
@tchaikov tchaikov requested a review from smithfarm April 2, 2018 12:04
@tchaikov tchaikov added this to the luminous milestone Apr 2, 2018
@epuertat
Copy link
Member

This backport didn't include the fixes for the file src/pybind/mgr/dashboard/CMakeLists.txt present in the master branch, as that file does not yet exist in Luminous (it's dashboard_v2 only). However, since dashboard_v2 backporting to Luminous is soon to happen, the changes to the mentioned file will be applied in a custom commit within the same PR (#23271).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants