Skip to content

Commit 436d074

Browse files
authored
Fixes for TileDB-Py 0.33.2 (#147)
* Rename tiledb.cc references to tiledb.libtiledb
1 parent 5aa3d24 commit 436d074

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import tiledb
88
from tiledb.bioimg import ATTR_NAME
9-
from tiledb.cc import WebpInputFormat
9+
from tiledb.libtiledb import WebpInputFormat
1010
from tiledb.bioimg.helpers import merge_ned_ranges
1111
import xml.etree.ElementTree as ET
1212

tests/integration/converters/test_ome_tiff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from tiledb.bioimg.converters.ome_tiff import OMETiffConverter
1313
from tiledb.bioimg.helpers import open_bioimg
1414
from tiledb.bioimg.openslide import TileDBOpenSlide
15-
from tiledb.cc import WebpInputFormat
15+
from tiledb.libtiledb import WebpInputFormat
1616

1717

1818
def test_ome_tiff_converter(tmp_path):

tests/integration/converters/test_ome_tiff_experimental.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from tiledb.bioimg.converters.ome_tiff import OMETiffConverter
88
from tiledb.bioimg.helpers import open_bioimg
99
from tiledb.bioimg.openslide import TileDBOpenSlide
10-
from tiledb.cc import WebpInputFormat
10+
from tiledb.libtiledb import WebpInputFormat
1111

1212

1313
# We need to expand on the test files. Most of the test files we have currently are not memory

tests/integration/converters/test_ome_zarr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from tiledb.bioimg.converters.ome_zarr import OMEZarrConverter
1212
from tiledb.bioimg.helpers import iter_color, open_bioimg
1313
from tiledb.bioimg.openslide import TileDBOpenSlide
14-
from tiledb.cc import WebpInputFormat
14+
from tiledb.libtiledb import WebpInputFormat
1515

1616
schemas = (get_schema(2220, 2967), get_schema(387, 463), get_schema(1280, 431))
1717

tests/integration/converters/test_openslide.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tiledb.bioimg.converters.openslide import OpenSlideConverter
1111
from tiledb.bioimg.helpers import open_bioimg
1212
from tiledb.bioimg.openslide import TileDBOpenSlide
13-
from tiledb.cc import WebpInputFormat
13+
from tiledb.libtiledb import WebpInputFormat
1414

1515

1616
@pytest.mark.parametrize("preserve_axes", [False, True])

tests/integration/converters/test_png.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tiledb.bioimg.converters.png import PNGConverter
1111
from tiledb.bioimg.helpers import open_bioimg
1212
from tiledb.bioimg.openslide import TileDBOpenSlide
13-
from tiledb.cc import WebpInputFormat
13+
from tiledb.libtiledb import WebpInputFormat
1414

1515

1616
def create_synthetic_image(

tiledb/bioimg/converters/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
register_group = None
3838

3939
import tiledb
40-
from tiledb.cc import WebpInputFormat
40+
from tiledb.libtiledb import WebpInputFormat
4141

4242
from .. import ATTR_NAME
4343
from ..helpers import (

tiledb/bioimg/converters/ome_tiff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
raise err
3131

3232
from tiledb import VFS, Config, Ctx
33-
from tiledb.cc import WebpInputFormat
3433
from tiledb.highlevel import _get_ctx
34+
from tiledb.libtiledb import WebpInputFormat
3535

3636
from .. import ATTR_NAME, EXPORT_TILE_SIZE, WHITE_RGBA
3737
from ..helpers import (

tiledb/bioimg/converters/ome_zarr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
raise err
3333

3434
from tiledb import Config, Ctx
35-
from tiledb.cc import WebpInputFormat
3635
from tiledb.highlevel import _get_ctx
36+
from tiledb.libtiledb import WebpInputFormat
3737

3838
from .. import WHITE_RGB
3939
from ..helpers import get_logger_wrapper, get_rgba, translate_config_to_s3fs

tiledb/bioimg/converters/openslide.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from numpy._typing import NDArray
99

1010
from tiledb import Config, Ctx
11-
from tiledb.cc import WebpInputFormat
1211
from tiledb.highlevel import _get_ctx
12+
from tiledb.libtiledb import WebpInputFormat
1313

1414
from ..helpers import cache_filepath, get_logger_wrapper, is_remote_protocol, iter_color
1515
from . import DEFAULT_SCRATCH_SPACE

tiledb/bioimg/converters/png.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
from PIL import Image
1919

2020
from tiledb import VFS, Config, Ctx
21-
from tiledb.cc import WebpInputFormat
2221
from tiledb.highlevel import _get_ctx
22+
from tiledb.libtiledb import WebpInputFormat
2323

2424
from ..helpers import get_logger_wrapper, iter_color
2525
from .axes import Axes

tiledb/bioimg/helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import tiledb
2626
from tiledb import Config, Ctx
27-
from tiledb.cc import WebpInputFormat
27+
from tiledb.libtiledb import WebpInputFormat
2828

2929
from . import ATTR_NAME
3030
from .converters.axes import Axes, AxesMapper
@@ -215,7 +215,7 @@ def iter_levels_meta(
215215
for o in group:
216216
with open_bioimg(o.uri, config=config, ctx=ctx) as array:
217217
try:
218-
level = array.meta["level"]
218+
level = int(array.meta["level"])
219219
except KeyError as exc:
220220
raise RuntimeError(
221221
"Key: 'level' not found in array metadata. Make sure that levels have been "

0 commit comments

Comments
 (0)