0.26.1 against TileDB 2.20.1 (#1900)

* 0.26.1 against TileDB 2.20.1 * Update cmake invocation for BUILD_SHARED_LIBS=ON We want the all-in-one libtiledb.dylib, which doesn't exist w/ TILEDB_STATIC=ON * Update CIBW_SKIP to eliminate warning by removing old versions
TileDB-Inc · Feb 28, 2024 · e3f83a7 · e3f83a7
1 parent c0e243e
commit e3f83a7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+# Release 0.26.1
+
+* TileDB-Py 0.26.1 includes TileDB Embedded [2.20.1](https://github.com/TileDB-Inc/TileDB/releases/tag/2.20.1)
+
 # Release 0.26.0
 
 * TileDB-Py 0.26.0 includes TileDB Embedded [2.20.0](https://github.com/TileDB-Inc/TileDB/releases/tag/2.20.0)

diff --git a/misc/azure-libtiledb-darwin.yml b/misc/azure-libtiledb-darwin.yml
@@ -26,7 +26,7 @@ steps:
       cd $TILEDB_BUILD
 
       # note: CMAKE_OSX_ARCHITECTURES is ignored on non-macOS platforms
-      cmake -B $TILEDB_BUILD -S $TILEDB_SRC/ -DTILEDB_VCPKG=ON -DTILEDB_WERROR=OFF -DTILEDB_SERIALIZATION=ON -DTILEDB_GCS=${TILEDB_GCS} -DTILEDB_S3=ON -DTILEDB_AZURE=ON -DCOMPILER_SUPPORTS_AVX2=FALSE -DTILEDB_TESTS=OFF -DTILEDB_STATIC=ON -DCMAKE_INSTALL_PREFIX=$TILEDB_INSTALL -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+      cmake -B $TILEDB_BUILD -S $TILEDB_SRC/ -DTILEDB_VCPKG=ON -DTILEDB_WERROR=OFF -DTILEDB_SERIALIZATION=ON -DTILEDB_GCS=${TILEDB_GCS} -DTILEDB_S3=ON -DTILEDB_AZURE=ON -DCOMPILER_SUPPORTS_AVX2=FALSE -DTILEDB_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=$TILEDB_INSTALL -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 
       cmake --build $TILEDB_BUILD --config Release -j3
       cmake --build $TILEDB_BUILD --target install-tiledb --config Release
@@ -51,7 +51,7 @@ steps:
       cd $(TILEDB_BUILD)
       :: use cmake directly because the powershell arg/quoting rules are bonkers
 
-      cmake -A X64 -DCMAKE_BUILD_TYPE=Release -DTILEDB_VCPKG=ON -DTILEDB_WERROR=ON -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_TOOLS=OFF -DTILEDB_SUPERBUILD=ON -DTILEDB_FORCE_ALL_DEPS=ON -DTILEDB_CPP_API=ON -DTILEDB_TESTS=OFF -DTILEDB_HDFS=OFF -DTILEDB_LOG_OUTPUT_ON_FAILURE=ON -DTILEDB_STATIC=ON -DTILEDB_VERBOSE=ON -DMSVC_MP_FLAG="/MP3" -DCMAKE_INSTALL_PREFIX=$(TILEDB_INSTALL) $(TILEDB_SRC) .
+      cmake -A X64 -DCMAKE_BUILD_TYPE=Release -DTILEDB_VCPKG=ON -DTILEDB_WERROR=ON -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_TOOLS=OFF -DTILEDB_SUPERBUILD=ON -DTILEDB_FORCE_ALL_DEPS=ON -DTILEDB_CPP_API=ON -DTILEDB_TESTS=OFF -DTILEDB_HDFS=OFF -DTILEDB_LOG_OUTPUT_ON_FAILURE=ON -DBUILD_SHARED_LIBS=ON -DTILEDB_VERBOSE=ON -DMSVC_MP_FLAG="/MP3" -DCMAKE_INSTALL_PREFIX=$(TILEDB_INSTALL) $(TILEDB_SRC) .
 
       cmake --build . --config Release -j3
       cmake --build . --target install-tiledb --config Release

diff --git a/misc/azure-release.yml b/misc/azure-release.yml
@@ -8,8 +8,10 @@ stages:
       ${{ else }}:
         TILEDBPY_VERSION: 0.26.0
         # NOTE: *must* update both LIBTILEDB_VERSION and LIBTILEDB_SHA
-        LIBTILEDB_VERSION: "2.20.0"
-        LIBTILEDB_SHA: 40552aa786ef4d4a3d7d72c384e46474df4cbb57
+        LIBTILEDB_VERSION: "2.20.1"
+        # NOTE: *must* update both LIBTILEDB_VERSION and LIBTILEDB_SHA
+        LIBTILEDB_SHA: 249c02481ed261a643b7fc63b748a90bce060e70
+      # kick the hash
       LIBTILEDB_REPO: https://github.com/TileDB-Inc/TileDB
       TILEDB_SRC: "$(Build.Repository.Localpath)/tiledb_src"
       TILEDB_BUILD: "$(Build.Repository.Localpath)/tiledb_build"
@@ -69,15 +71,15 @@ stages:
           matrix:
             linux_py:
               imageName: "ubuntu-latest"
-              CIBW_SKIP: "cp27-* cp35-* cp36-* *_i686 pp* *musllinux*"
+              CIBW_SKIP: "cp36-* *_i686 pp* *musllinux*"
               CIBW_BUILD_VERBOSITY: 3
               CIBW_ARCHS_MACOS: ""
             macOS_py:
               imageName: "macOS-12"
               MACOSX_DEPLOYMENT_TARGET: 11
               TILEDB_INSTALL: "$(Pipeline.Workspace)/.libtiledb_dist/$(LIBTILEDB_SHA)-macos-x86_64"
               CIBW_ARCHS_MACOS: "x86_64"
-              CIBW_SKIP: "cp27-* cp35-* cp36-* pp*"
+              CIBW_SKIP: "cp36-* pp*"
               CIBW_TEST_SKIP: "cp37-*"
               CIBW_BUILD_VERBOSITY: 3
             macOS_arm64_py:
@@ -87,10 +89,10 @@ stages:
               CIBW_BUILD_VERBOSITY: 3
               CIBW_ARCHS_MACOS: "arm64"
               # NumPy is only available in CPython 3.8+ on macOS-arm64
-              CIBW_SKIP: "cp27-* cp35-* cp36-* cp37-* pp*"
+              CIBW_SKIP: "cp36-* cp37-* pp*"
             windows_py:
               imageName: "windows-latest"
-              CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp*"
+              CIBW_SKIP: "cp36-* *-win32 pp*"
               CIBW_BUILD_VERBOSITY: 3
               CIBW_ARCHS_MACOS: ""
         pool:

diff --git a/misc/pypi_linux/build.aarch64.sh b/misc/pypi_linux/build.aarch64.sh
@@ -11,7 +11,7 @@ export LIBTILEDB_VERSION=2.5.3
 export TILEDBPY_VERSION=0.11.5
 
 export CIBW_MANYLINUX_AARCH64_IMAGE=wheel-host-aarch64.manylinux2014-$LIBTILEDB_VERSION
-export CIBW_SKIP='cp27-* cp35-* cp36-* cp310-* pp-* *_i686 pp* *-musllinux*'
+export CIBW_SKIP='cp36-* cp310-* pp-* *_i686 pp* *-musllinux*'
 export CIBW_PLATFORM='linux'
 export CIBW_ENVIRONMENT='TILEDB_PATH=/usr/local/'
 export CIBW_BUILD_VERBOSITY=1