Skip to content

Commit

Permalink
Update to 0.26 / TileDB 2.20 (#1893)
Browse files Browse the repository at this point in the history
* Bump to 0.26 with TileDB 2.20
* Fix macOS tar extract error 'Can't restore time'
* Update HISTORY.md
  • Loading branch information
ihnorton authored Feb 15, 2024
1 parent b564ea2 commit 2d56a4a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@ jobs:
choco install wget --no-progress
if wget https://github.com/TileDB-Inc/TileDB/releases/download/$LIBTILEDB_VERSION/tiledb-windows-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.zip; then
unzip tiledb-windows-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.zip -d /usr/local
cp /usr/local/bin/tiledb.dll tiledb
python setup.py develop --tiledb=/usr/local
else
mkdir libtiledb
unzip tiledb-windows-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.zip -d libtiledb
cp libtiledb/bin/tiledb.dll tiledb
python setup.py develop --tiledb=libtiledb
else
# Build from source as fallback
python setup.py build_ext --inplace
python setup.py develop
Expand All @@ -86,9 +87,10 @@ jobs:
set -xeo pipefail
if wget https://github.com/TileDB-Inc/TileDB/releases/download/$LIBTILEDB_VERSION/tiledb-macos-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz; then
sudo tar -vzxf tiledb-macos-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz -C /usr/local
python setup.py develop --tiledb=/usr/local
else
mkdir libtiledb
sudo tar -vzxf tiledb-macos-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz -C libtiledb
python setup.py develop --tiledb=libtiledb
else
# Build from source as fallback
python setup.py build_ext --inplace
python setup.py develop
Expand All @@ -100,9 +102,10 @@ jobs:
set -xeo pipefail
if wget https://github.com/TileDB-Inc/TileDB/releases/download/$LIBTILEDB_VERSION/tiledb-linux-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz; then
sudo tar -vzxf tiledb-linux-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz -C /usr/local
python setup.py develop --tiledb=/usr/local
else
mkdir libtiledb
sudo tar -vzxf tiledb-linux-x86_64-$LIBTILEDB_VERSION-$LIBTILEDB_SHA.tar.gz -C libtiledb
python setup.py develop --tiledb=libtiledb
else
# Build from source as fallback
python setup.py build_ext --inplace
python setup.py develop
Expand Down
8 changes: 6 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
# Next
# 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)

## Bug Fixes

* Add safe `Group.__repr__` [#1890](https://github.com/TileDB-Inc/TileDB-Py/pull/1890)
* Use safe repr if ArraySchema was not properly constructed [#1896](https://github.com/TileDB-Inc/TileDB-Py/pull/1896)

## Improvements

* Warn when `os.fork()` is used in the presence of a Tiledb context [#1876](https://github.com/TileDB-Inc/TileDB-Py/pull/1876/files).
* Enable GCS in osx-arm64 wheel builds [#1899](https://github.com/TileDB-Inc/TileDB-Py/pull/1899)

# Release 0.24.0
# Release 0.25.0

* TileDB-Py 0.25.0 includes TileDB Embedded [2.19.0](https://github.com/TileDB-Inc/TileDB/releases/tag/2.19.0)

Expand Down
6 changes: 3 additions & 3 deletions misc/azure-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ stages:
LIBTILEDB_VERSION: dev
LIBTILEDB_SHA: dev
${{ else }}:
TILEDBPY_VERSION: 0.25.0
TILEDBPY_VERSION: 0.26.0
# NOTE: *must* update both LIBTILEDB_VERSION and LIBTILEDB_SHA
LIBTILEDB_VERSION: 2.19.0
LIBTILEDB_SHA: fa30a88abc5504ed8387e25937744afcd3802232
LIBTILEDB_VERSION: "2.20.0"
LIBTILEDB_SHA: 40552aa786ef4d4a3d7d72c384e46474df4cbb57
LIBTILEDB_REPO: https://github.com/TileDB-Inc/TileDB
TILEDB_SRC: "$(Build.Repository.Localpath)/tiledb_src"
TILEDB_BUILD: "$(Build.Repository.Localpath)/tiledb_build"
Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@
# - this is for builds-from-source
# - release builds are controlled by `misc/azure-release.yml`
# - this should be set to the current core release, not `dev`
TILEDB_VERSION = "2.19.0"
TILEDB_VERSION = "2.20.0"

# allow overriding w/ environment variable
TILEDB_VERSION = os.environ.get("TILEDB_VERSION") or TILEDB_VERSION
TILEDB_VERSION = (
os.environ.get("TILEDB_VERSION")
or os.environ.get("LIBTILEDB_VERSION") # For CI override
or TILEDB_VERSION
)

# Use `setup.py [] --debug` for a debug build of libtiledb
TILEDB_DEBUG_BUILD = False
Expand Down

0 comments on commit 2d56a4a

Please sign in to comment.