From 0cd9d804a40f256e90170c1c3c9922734e198e3f Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Mon, 6 Jan 2025 14:06:17 +0100 Subject: [PATCH] Handle also `main` as DUCKDB_GIT_VERSION for C-API extensions, default to latest available Python package --- makefiles/c_api_extensions/base.Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/makefiles/c_api_extensions/base.Makefile b/makefiles/c_api_extensions/base.Makefile index ecb2e7e..5986b22 100644 --- a/makefiles/c_api_extensions/base.Makefile +++ b/makefiles/c_api_extensions/base.Makefile @@ -101,11 +101,12 @@ TEST_RUNNER_RELEASE=$(TEST_RUNNER_BASE) --external-extension build/release/$(EXT # By default latest duckdb is installed, set DUCKDB_TEST_VERSION to switch to a different version DUCKDB_INSTALL_VERSION?= +DUCKDB_INSTALL_OPTIONS?= ifneq ($(DUCKDB_TEST_VERSION),) DUCKDB_INSTALL_VERSION===$(DUCKDB_TEST_VERSION) -endif - -ifneq ($(DUCKDB_GIT_VERSION),) +else ifeq ($(DUCKDB_GIT_VERSION),main) + DUCKDB_INSTALL_OPTIONS= --pre +else ifneq ($(DUCKDB_GIT_VERSION),) DUCKDB_INSTALL_VERSION===$(DUCKDB_GIT_VERSION) endif @@ -223,7 +224,7 @@ venv: configure/venv configure/venv: $(PYTHON_BIN) -m venv configure/venv - $(PYTHON_VENV_BIN) -m pip install 'duckdb$(DUCKDB_INSTALL_VERSION)' + $(PYTHON_VENV_BIN) -m pip install 'duckdb$(DUCKDB_INSTALL_VERSION)' $(DUCKDB_INSTALL_OPTIONS) $(PYTHON_VENV_BIN) -m pip install git+https://github.com/duckdb/duckdb-sqllogictest-python #############################################