80 lines
3.1 KiB
Diff
80 lines
3.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2b49e11288..0a4a69b9a0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
|
set(SUN TRUE)
|
|
endif()
|
|
|
|
-find_package(Git)
|
|
-if(Git_FOUND)
|
|
- if (NOT DEFINED GIT_COMMIT_HASH)
|
|
- execute_process(
|
|
- COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
|
|
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
- RESULT_VARIABLE GIT_RESULT
|
|
- OUTPUT_VARIABLE GIT_COMMIT_HASH
|
|
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
- endif()
|
|
- execute_process(
|
|
- COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
|
|
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
- OUTPUT_VARIABLE GIT_LAST_TAG
|
|
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
- execute_process(
|
|
- COMMAND ${GIT_EXECUTABLE} describe --tags --long
|
|
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
- OUTPUT_VARIABLE GIT_ITERATION
|
|
- OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
-else()
|
|
- message("Git NOT FOUND")
|
|
-endif()
|
|
-
|
|
-if(GIT_RESULT EQUAL "0")
|
|
- string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}")
|
|
- string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}")
|
|
- string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}")
|
|
- string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}")
|
|
-
|
|
- if(DUCKDB_DEV_ITERATION EQUAL 0)
|
|
- # on a tag; directly use the version
|
|
- set(DUCKDB_VERSION "${GIT_LAST_TAG}")
|
|
- else()
|
|
- # not on a tag, increment the patch version by one and add a -devX suffix
|
|
- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1")
|
|
- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
|
|
- endif()
|
|
-else()
|
|
- # fallback for when building from tarball
|
|
- set(DUCKDB_MAJOR_VERSION 0)
|
|
- set(DUCKDB_MINOR_VERSION 0)
|
|
- set(DUCKDB_PATCH_VERSION 1)
|
|
- set(DUCKDB_DEV_ITERATION 0)
|
|
- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
|
|
-endif()
|
|
+set(DUCKDB_VERSION "@DUCKDB_VERSION@")
|
|
|
|
message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")
|
|
|
|
diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py
|
|
index fdf2911019..c363cc518a 100644
|
|
--- a/tools/pythonpkg/setup.py
|
|
+++ b/tools/pythonpkg/setup.py
|
|
@@ -163,8 +163,6 @@ if 'BUILD_HTTPFS' in os.environ:
|
|
for ext in extensions:
|
|
toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())])
|
|
|
|
-toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1'])
|
|
-
|
|
|
|
class get_pybind_include(object):
|
|
def __init__(self, user=False):
|
|
@@ -343,7 +341,7 @@ setup(
|
|
packages=packages,
|
|
include_package_data=True,
|
|
python_requires='>=3.7.0',
|
|
- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'],
|
|
+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'],
|
|
use_scm_version=setuptools_scm_conf,
|
|
tests_require=['google-cloud-storage', 'mypy', 'pytest'],
|
|
classifiers=[
|