From e32368e56a554d6ee009212e274c2645485d73bc Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Mon, 20 Mar 2023 10:22:51 +0100 Subject: [PATCH] build: use `pip wheel` to get cockpit wheel Now that we have pip in the tasks container, this is a lot easier, and it will allow us to drop the make-wheel script from the cockpit project. --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 46b1391..43bf9a5 100644 --- a/Makefile +++ b/Makefile @@ -159,13 +159,7 @@ COCKPIT_PYBRIDGE_REF = main COCKPIT_WHEEL = cockpit-0-py3-none-any.whl $(COCKPIT_WHEEL): - # aka: pip wheel git+https://github.com/cockpit-project/cockpit.git@${COCKPIT_PYBRIDGE_REF} - rm -rf tmp/pybridge - git init tmp/pybridge - git -C tmp/pybridge remote add origin https://github.com/cockpit-project/cockpit - git -C tmp/pybridge fetch --depth=1 origin ${COCKPIT_PYBRIDGE_REF} - git -C tmp/pybridge reset --hard FETCH_HEAD - cp "$$(tmp/pybridge/tools/make-wheel)" $@ + pip wheel git+https://github.com/cockpit-project/cockpit.git@${COCKPIT_PYBRIDGE_REF} VM_DEPENDS = $(COCKPIT_WHEEL) VM_CUSTOMIZE_FLAGS = --install $(COCKPIT_WHEEL)