From 69e0f3088130190dbd17955dea502eaa2b080493 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 30 Nov 2023 17:59:26 -0500 Subject: [PATCH] Depend on core 2.18.2, tiledb-py 0.24.0, tiledb-r 0.22.0 (#1936) * Depend on core 2.18.2, tiledb-py 0.24.0, tiledb-r 0.22.0 * debug * undo previous * debug --- apis/python/setup.py | 4 +-- apis/r/DESCRIPTION | 2 +- apis/r/tools/get_tarball.R | 4 +-- .../cmake/Modules/FindTileDB_EP.cmake | 28 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apis/python/setup.py b/apis/python/setup.py index 5462a20820..f7840d8c6b 100644 --- a/apis/python/setup.py +++ b/apis/python/setup.py @@ -280,11 +280,11 @@ def run(self): "numba==0.56.4; python_version<'3.8'", "numpy>=1.18,<1.24; python_version<'3.8'", "pandas", - "pyarrow>=9.0.0", + "pyarrow>=9.0.0,<13.0.0", # MacOS issue with import pyarrow before import tiledb at >= 13.0 "scanpy>=1.9.2", "scipy", "somacore==1.0.4", - "tiledb~=0.23.4", + "tiledb~=0.24.0", "typing-extensions", # Note "-" even though `import typing_extensions` ], extras_require={ diff --git a/apis/r/DESCRIPTION b/apis/r/DESCRIPTION index 5607d4a2fc..07647b7d1a 100644 --- a/apis/r/DESCRIPTION +++ b/apis/r/DESCRIPTION @@ -34,7 +34,7 @@ Imports: Matrix, stats, bit64, - tiledb (>= 0.21.3), + tiledb (>= 0.22.0), arrow, utils, fs, diff --git a/apis/r/tools/get_tarball.R b/apis/r/tools/get_tarball.R index 70c8b0d6b7..7a685d75d1 100644 --- a/apis/r/tools/get_tarball.R +++ b/apis/r/tools/get_tarball.R @@ -1,8 +1,8 @@ #!/usr/bin/env Rscript ## version pinning info -tiledb_core_version <- "2.17.4" -tiledb_core_sha1 <- "a1f648e" +tiledb_core_version <- "2.18.2" +tiledb_core_sha1 <- "9ae6e1a" 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 cfd718b65d..846ecd74ff 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.17.4/tiledb-windows-x86_64-2.17.4-a1f648e.zip") - SET(DOWNLOAD_SHA1 "d82a090d231e5cebd10205af8b80884e934b9e9f") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-windows-x86_64-2.18.2-9ae6e1a.zip") + SET(DOWNLOAD_SHA1 "c440403fde701e5014a7ffa046d38bb49b141e55") 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.17.4/tiledb-macos-x86_64-2.17.4-a1f648e.tar.gz") - SET(DOWNLOAD_SHA1 "9e3807e1b63b21849a374c6d9c9f161b46a9cc5a") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-x86_64-2.18.2-9ae6e1a.tar.gz") + SET(DOWNLOAD_SHA1 "6ba986407b2d0e25fb5df19d08ed22fefeac1c2a") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64) - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.4/tiledb-macos-arm64-2.17.4-a1f648e.tar.gz") - SET(DOWNLOAD_SHA1 "e6ec0634f665943ff9879041ab122bdaa96349df") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-arm64-2.18.2-9ae6e1a.tar.gz") + SET(DOWNLOAD_SHA1 "4395a283db57844a944f02dab5bd0f0001eb7e30") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.4/tiledb-macos-x86_64-2.17.4-a1f648e.tar.gz") - SET(DOWNLOAD_SHA1 "9e3807e1b63b21849a374c6d9c9f161b46a9cc5a") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-x86_64-2.18.2-9ae6e1a.tar.gz") + SET(DOWNLOAD_SHA1 "6ba986407b2d0e25fb5df19d08ed22fefeac1c2a") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.4/tiledb-macos-arm64-2.17.4-a1f648e.tar.gz") - SET(DOWNLOAD_SHA1 "e6ec0634f665943ff9879041ab122bdaa96349df") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-macos-arm64-2.18.2-9ae6e1a.tar.gz") + SET(DOWNLOAD_SHA1 "4395a283db57844a944f02dab5bd0f0001eb7e30") endif() else() # Linux - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.4/tiledb-linux-x86_64-2.17.4-a1f648e.tar.gz") - SET(DOWNLOAD_SHA1 "7849cbbf19f5f9252e4be5350328754b01938aaa") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.18.2/tiledb-linux-x86_64-2.18.2-9ae6e1a.tar.gz") + SET(DOWNLOAD_SHA1 "6386504a58d52330f41fa688a2b259b67824e2c8") 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.17.4.zip" - URL_HASH SHA1=a6a848cd3d3f19ed1dd6057e3f05fb7b54740016 + URL "https://github.com/TileDB-Inc/TileDB/archive/2.18.2.zip" + URL_HASH SHA1=70bb2e9a7603675849830b763d1a0d17fce4bafa DOWNLOAD_NAME "tiledb.zip" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}