From fdffe47ade2261651c2e95cb485951179920a35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Baran?= Date: Fri, 16 Feb 2024 19:01:22 +0100 Subject: [PATCH] Increment tiledb version to 2.20.0 (0.26.0 for Py) (#241) --- apis/python/requirements-py.txt | 4 ++-- pyproject.toml | 2 +- src/cmake/Modules/FindTileDB_EP.cmake | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apis/python/requirements-py.txt b/apis/python/requirements-py.txt index 6709335f4..62b22b9b7 100644 --- a/apis/python/requirements-py.txt +++ b/apis/python/requirements-py.txt @@ -1,4 +1,4 @@ numpy==1.24.3 tiledb-cloud==0.10.24 -tiledb==0.25.0 -scikit-learn==1.3.2 +tiledb==0.26.0 +scikit-learn==1.3.2 \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 2e96980a1..d62277827 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ classifiers = [ dependencies = [ "tiledb-cloud>=0.11", - "tiledb>=0.25.0", + "tiledb>=0.26.0", "typing-extensions", # for tiledb-cloud indirect, x-ref https://github.com/TileDB-Inc/TileDB-Cloud-Py/pull/428 "scikit-learn", ] diff --git a/src/cmake/Modules/FindTileDB_EP.cmake b/src/cmake/Modules/FindTileDB_EP.cmake index a6ac872c3..f3e6aaf05 100644 --- a/src/cmake/Modules/FindTileDB_EP.cmake +++ b/src/cmake/Modules/FindTileDB_EP.cmake @@ -52,8 +52,8 @@ else() # Try to download prebuilt artifacts unless the user specifies to build from source if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.0/tiledb-windows-x86_64-2.19.0-fa30a88a.zip") - SET(DOWNLOAD_SHA1 "ab8b61a35f0776e851c4eedcb1340df4d8cfb4b3") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-windows-x86_64-2.20.0-40552aa.zip") + SET(DOWNLOAD_SHA1 "cb7df1c80c7034d2d8d16cea5114fdca7306e87d") elseif(APPLE) # OSX if (DEFINED CMAKE_OSX_ARCHITECTURES) set(ACTUAL_TARGET ${CMAKE_OSX_ARCHITECTURES}) @@ -63,15 +63,15 @@ else() if (ACTUAL_TARGET MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.0/tiledb-macos-x86_64-2.19.0-fa30a88a.tar.gz") - SET(DOWNLOAD_SHA1 "089b3aa8a92df0bd5a8f7515ed8e5b6bacb5ab47") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-macos-x86_64-2.20.0-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "83af0a52e6756129472073393c28ec15d6265e0c") elseif (ACTUAL_TARGET STREQUAL arm64 OR ACTUAL_TARGET MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.0/tiledb-macos-arm64-2.19.0-fa30a88a.tar.gz") - SET(DOWNLOAD_SHA1 "83acdc7529d50dcf293dbd6bbc81263856c7c74c") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-macos-arm64-2.20.0-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "78ea78b0d7ffe4edb5bc6f98a8b620cc6f7d0e85") endif() else() # Linux - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.19.0/tiledb-linux-x86_64-2.19.0-fa30a88a.tar.gz") - SET(DOWNLOAD_SHA1 "d236688dbeff2536a8938cf8bf0d478b9f6108f6") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.20.0/tiledb-linux-x86_64-2.20.0-40552aa.tar.gz") + SET(DOWNLOAD_SHA1 "9104da8d6979c3b96e63b9e28fd41a403d412079") endif() ExternalProject_Add(ep_tiledb @@ -93,8 +93,8 @@ else() else() # Build from source ExternalProject_Add(ep_tiledb PREFIX "externals" - URL "https://github.com/TileDB-Inc/TileDB/archive/2.19.0.zip" - URL_HASH SHA1=ade4c52490440f3d348e0f2d4677b322c83993df + URL "https://github.com/TileDB-Inc/TileDB/archive/refs/tags/2.20.0.zip" + URL_HASH SHA1=78324232ed00bbb32a83699f561b7b5c10814d20 DOWNLOAD_NAME "tiledb.zip" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}