From 9ec4fd35ceae3f87ad440c2df22dfdfee23f468e Mon Sep 17 00:00:00 2001 From: John Kerl Date: Mon, 29 Jan 2024 19:43:13 -0500 Subject: [PATCH] Use core 2.19.1 (#2084) * Use core 2.19.1 * typofix --- apis/r/tools/get_tarball.R | 6 ++-- .../cmake/Modules/FindTileDB_EP.cmake | 28 +++++++++---------- scripts/update-tiledb-version.py | 5 +++- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/apis/r/tools/get_tarball.R b/apis/r/tools/get_tarball.R index cb40bd5b85..34d435d606 100644 --- a/apis/r/tools/get_tarball.R +++ b/apis/r/tools/get_tarball.R @@ -1,9 +1,9 @@ #!/usr/bin/env Rscript ## version pinning info -tiledb_core_version <- "2.19.0" -# 8-nybble hash for 2.19.0 only. Please see https://github.com/TileDB-Inc/TileDB/pull/4599. -tiledb_core_sha1 <- "fa30a88a" +tiledb_core_version <- "2.19.1" +# 8-nybble hash for 2.19.0 and 2.19.1 only. Please see https://github.com/TileDB-Inc/TileDB/pull/4599. +tiledb_core_sha1 <- "29ceb3e7" if ( ! dir.exists("inst/") ) { stop("No 'inst/' directory. Exiting.", call. = FALSE) diff --git a/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake b/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake index bc8f96025e..fc8b0863f3 100644 --- a/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake +++ b/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake @@ -58,8 +58,8 @@ else() # NB When updating the pinned URLs here, please also update in file apis/r/tools/get_tarball.R 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.19.1/tiledb-windows-x86_64-2.19.1-29ceb3e7.zip") + SET(DOWNLOAD_SHA1 "b3c6002e8792501a8020aa71f2ea75019b6e3339") elseif(APPLE) # OSX # Status quo as of 2023-05-18: @@ -76,22 +76,22 @@ else() # o CMAKE_SYSTEM_PROCESSOR is x86_64 if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64) - 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.19.1/tiledb-macos-x86_64-2.19.1-29ceb3e7.tar.gz") + SET(DOWNLOAD_SHA1 "c9c667689e0a8c4e5a2989f179995b0a013ca047") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64) - 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.19.1/tiledb-macos-arm64-2.19.1-29ceb3e7.tar.gz") + SET(DOWNLOAD_SHA1 "eb15d2d6c2920011765e1c102a43c23b8d7b1b0f") elseif (CMAKE_SYSTEM_PROCESSOR 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.19.1/tiledb-macos-x86_64-2.19.1-29ceb3e7.tar.gz") + SET(DOWNLOAD_SHA1 "c9c667689e0a8c4e5a2989f179995b0a013ca047") elseif (CMAKE_SYSTEM_PROCESSOR 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.19.1/tiledb-macos-arm64-2.19.1-29ceb3e7.tar.gz") + SET(DOWNLOAD_SHA1 "eb15d2d6c2920011765e1c102a43c23b8d7b1b0f") 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.19.1/tiledb-linux-x86_64-2.19.1-29ceb3e7.tar.gz") + SET(DOWNLOAD_SHA1 "84dda6d2faa3abaef9dae296f16de1979df0f9b0") endif() ExternalProject_Add(ep_tiledb @@ -113,8 +113,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/2.19.1.zip" + URL_HASH SHA1=6255616066c193ca6c595770a3ec72e316d8b280 DOWNLOAD_NAME "tiledb.zip" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX} diff --git a/scripts/update-tiledb-version.py b/scripts/update-tiledb-version.py index df42d8a12d..886e2eb600 100755 --- a/scripts/update-tiledb-version.py +++ b/scripts/update-tiledb-version.py @@ -4,6 +4,7 @@ import hashlib import os import re +import sys from fileinput import FileInput from subprocess import run from urllib.request import urlopen @@ -12,6 +13,7 @@ def hash_url_file(url): """Return SHA1 hash of the file located at the provided url.""" + print(f"URL {url}", file=sys.stderr) BLOCK_SIZE = 65536 hash = hashlib.sha1() with urlopen(url) as fp: @@ -30,7 +32,7 @@ def get_version_hash(version): m = re.search(rf"\s(\S+)\s+refs/tags/{version}\s", output) if m: - # 8-nybble hash for 2.19.0 only. Please see https://github.com/TileDB-Inc/TileDB/pull/4599. + # 8-nybble hash for 2.19.0 and 2.19.1 only. Please see https://github.com/TileDB-Inc/TileDB/pull/4599. return m.group(1)[0:8] print(output) @@ -92,6 +94,7 @@ def update_version(filepath, new_version, new_hash, update_sha=True): def main(args): new_version = args.version new_hash = get_version_hash(new_version) + print(f"New hash {new_hash}") # update cmake version filepath = f"{os.path.dirname(__file__)}/../libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake"