Skip to content

Commit e3f83a7

Browse files
authored
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
1 parent c0e243e commit e3f83a7

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

HISTORY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Release 0.26.1
2+
3+
* TileDB-Py 0.26.1 includes TileDB Embedded [2.20.1](https://github.com/TileDB-Inc/TileDB/releases/tag/2.20.1)
4+
15
# Release 0.26.0
26

37
* TileDB-Py 0.26.0 includes TileDB Embedded [2.20.0](https://github.com/TileDB-Inc/TileDB/releases/tag/2.20.0)

misc/azure-libtiledb-darwin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ steps:
2626
cd $TILEDB_BUILD
2727
2828
# note: CMAKE_OSX_ARCHITECTURES is ignored on non-macOS platforms
29-
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}
29+
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}
3030
3131
cmake --build $TILEDB_BUILD --config Release -j3
3232
cmake --build $TILEDB_BUILD --target install-tiledb --config Release
@@ -51,7 +51,7 @@ steps:
5151
cd $(TILEDB_BUILD)
5252
:: use cmake directly because the powershell arg/quoting rules are bonkers
5353
54-
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) .
54+
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) .
5555
5656
cmake --build . --config Release -j3
5757
cmake --build . --target install-tiledb --config Release

misc/azure-release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ stages:
88
${{ else }}:
99
TILEDBPY_VERSION: 0.26.0
1010
# NOTE: *must* update both LIBTILEDB_VERSION and LIBTILEDB_SHA
11-
LIBTILEDB_VERSION: "2.20.0"
12-
LIBTILEDB_SHA: 40552aa786ef4d4a3d7d72c384e46474df4cbb57
11+
LIBTILEDB_VERSION: "2.20.1"
12+
# NOTE: *must* update both LIBTILEDB_VERSION and LIBTILEDB_SHA
13+
LIBTILEDB_SHA: 249c02481ed261a643b7fc63b748a90bce060e70
14+
# kick the hash
1315
LIBTILEDB_REPO: https://github.com/TileDB-Inc/TileDB
1416
TILEDB_SRC: "$(Build.Repository.Localpath)/tiledb_src"
1517
TILEDB_BUILD: "$(Build.Repository.Localpath)/tiledb_build"
@@ -69,15 +71,15 @@ stages:
6971
matrix:
7072
linux_py:
7173
imageName: "ubuntu-latest"
72-
CIBW_SKIP: "cp27-* cp35-* cp36-* *_i686 pp* *musllinux*"
74+
CIBW_SKIP: "cp36-* *_i686 pp* *musllinux*"
7375
CIBW_BUILD_VERBOSITY: 3
7476
CIBW_ARCHS_MACOS: ""
7577
macOS_py:
7678
imageName: "macOS-12"
7779
MACOSX_DEPLOYMENT_TARGET: 11
7880
TILEDB_INSTALL: "$(Pipeline.Workspace)/.libtiledb_dist/$(LIBTILEDB_SHA)-macos-x86_64"
7981
CIBW_ARCHS_MACOS: "x86_64"
80-
CIBW_SKIP: "cp27-* cp35-* cp36-* pp*"
82+
CIBW_SKIP: "cp36-* pp*"
8183
CIBW_TEST_SKIP: "cp37-*"
8284
CIBW_BUILD_VERBOSITY: 3
8385
macOS_arm64_py:
@@ -87,10 +89,10 @@ stages:
8789
CIBW_BUILD_VERBOSITY: 3
8890
CIBW_ARCHS_MACOS: "arm64"
8991
# NumPy is only available in CPython 3.8+ on macOS-arm64
90-
CIBW_SKIP: "cp27-* cp35-* cp36-* cp37-* pp*"
92+
CIBW_SKIP: "cp36-* cp37-* pp*"
9193
windows_py:
9294
imageName: "windows-latest"
93-
CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp*"
95+
CIBW_SKIP: "cp36-* *-win32 pp*"
9496
CIBW_BUILD_VERBOSITY: 3
9597
CIBW_ARCHS_MACOS: ""
9698
pool:

misc/pypi_linux/build.aarch64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export LIBTILEDB_VERSION=2.5.3
1111
export TILEDBPY_VERSION=0.11.5
1212

1313
export CIBW_MANYLINUX_AARCH64_IMAGE=wheel-host-aarch64.manylinux2014-$LIBTILEDB_VERSION
14-
export CIBW_SKIP='cp27-* cp35-* cp36-* cp310-* pp-* *_i686 pp* *-musllinux*'
14+
export CIBW_SKIP='cp36-* cp310-* pp-* *_i686 pp* *-musllinux*'
1515
export CIBW_PLATFORM='linux'
1616
export CIBW_ENVIRONMENT='TILEDB_PATH=/usr/local/'
1717
export CIBW_BUILD_VERBOSITY=1

0 commit comments

Comments
 (0)