Skip to content

Commit 9518b49

Browse files
authored
Upgrade TileDB-VCF to 2.16.0, update version for Java/Spark (#551)
* Upgrade TileDB-VCF to 2.16.0 * fix exception matching * Update java/spark for version 0.25.0
1 parent 3edddf8 commit 9518b49

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

apis/java/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group 'io.tiledb'
10-
version '0.24.0'
10+
version '0.25.0'
1111

1212
sourceCompatibility = 1.8
1313
targetCompatibility = 1.8

apis/python/tests/test_tiledbvcf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def check_if_compatible(uri):
4040
with tiledb.open(uri):
4141
return True
4242
except tiledb.cc.TileDBError as e:
43-
if "Incompatible format version" in str(e):
43+
if "incompatible format version" in str(e).lower():
4444
raise pytest.skip.Exception(
4545
"Test skipped due to incompatible format version"
4646
)

apis/spark/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group 'io.tiledb'
10-
version '0.24.0'
10+
version '0.25.0'
1111

1212
sourceCompatibility = 1.8
1313
targetCompatibility = 1.8

apis/spark3/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group 'io.tiledb'
10-
version '0.24.0'
10+
version '0.25.0'
1111

1212
sourceCompatibility = 1.8
1313
targetCompatibility = 1.8

libtiledbvcf/cmake/Modules/FindTileDB_EP.cmake

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ else()
5252
# Try to download prebuilt artifacts unless the user specifies to build from source
5353
if(DOWNLOAD_TILEDB_PREBUILT)
5454
if (WIN32) # Windows
55-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.15.4/tiledb-windows-x86_64-2.15.4-57c9edf.zip")
56-
SET(DOWNLOAD_SHA1 "6cabf3049fcd11a96a93704870b15774343b563f")
55+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0/tiledb-windows-x86_64-2.16.0-d682dd0.zip")
56+
SET(DOWNLOAD_SHA1 "82a79fda3daecc46ae24c86a328e52184460dabe")
5757
elseif(APPLE) # OSX
5858

5959
if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
60-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.15.4/tiledb-macos-x86_64-2.15.4-57c9edf.tar.gz")
61-
SET(DOWNLOAD_SHA1 "ca7ef10b01715e277387532591fd4bff8efb1689")
60+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0/tiledb-macos-x86_64-2.16.0-d682dd0.tar.gz")
61+
SET(DOWNLOAD_SHA1 "d7b22fa3cb9cbe131734d9f18beb3362908aeccf")
6262
elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
63-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.15.4/tiledb-macos-arm64-2.15.4-57c9edf.tar.gz")
64-
SET(DOWNLOAD_SHA1 "5f7162a34f62d4d448387b9590823d3dcfe1b816")
63+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0/tiledb-macos-arm64-2.16.0-d682dd0.tar.gz")
64+
SET(DOWNLOAD_SHA1 "09c62e3211e5277263c1545d74d698d450ebcb77")
6565
endif()
6666
else() # Linux
67-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.15.4/tiledb-linux-x86_64-2.15.4-57c9edf.tar.gz")
68-
SET(DOWNLOAD_SHA1 "19397dbfef46d796d11f4d8bb80f7bd01230e0a6")
67+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.0/tiledb-linux-x86_64-2.16.0-d682dd0.tar.gz")
68+
SET(DOWNLOAD_SHA1 "be0bfd5512c159b960988a4bd41366e9f020115f")
6969
endif()
7070

7171
ExternalProject_Add(ep_tiledb
@@ -87,8 +87,8 @@ else()
8787
else() # Build from source
8888
ExternalProject_Add(ep_tiledb
8989
PREFIX "externals"
90-
URL "https://github.com/TileDB-Inc/TileDB/archive/2.15.4.zip"
91-
URL_HASH SHA1=ba020e20a0b6ef9876e3138474e1fdb1d6c4b32b
90+
URL "https://github.com/TileDB-Inc/TileDB/archive/2.16.0.zip"
91+
URL_HASH SHA1=c2779f931c84d931e5fca6dc3a858e66fc542276
9292
DOWNLOAD_NAME "tiledb.zip"
9393
CMAKE_ARGS
9494
-DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}

0 commit comments

Comments
 (0)