bfio 2.4.5__tar.gz → 2.4.7__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bfio-2.4.5/src/bfio.egg-info → bfio-2.4.7}/PKG-INFO +8 -7
- {bfio-2.4.5 → bfio-2.4.7}/README.md +4 -4
- {bfio-2.4.5 → bfio-2.4.7}/pyproject.toml +4 -3
- bfio-2.4.7/src/bfio/VERSION +1 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/backends.py +1 -11
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/utils.py +1 -1
- {bfio-2.4.5 → bfio-2.4.7/src/bfio.egg-info}/PKG-INFO +8 -7
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio.egg-info/requires.txt +2 -1
- {bfio-2.4.5 → bfio-2.4.7}/tests/test_read.py +36 -0
- bfio-2.4.5/src/bfio/VERSION +0 -1
- {bfio-2.4.5 → bfio-2.4.7}/LICENSE +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/setup.cfg +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/__init__.py +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/base_classes.py +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/bfio.py +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio/ts_backends.py +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio.egg-info/SOURCES.txt +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio.egg-info/dependency_links.txt +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/src/bfio.egg-info/top_level.txt +0 -0
- {bfio-2.4.5 → bfio-2.4.7}/tests/test_write.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.2
|
|
2
2
|
Name: bfio
|
|
3
|
-
Version: 2.4.
|
|
3
|
+
Version: 2.4.7
|
|
4
4
|
Summary: Simple reading and writing classes for tiled tiffs using Bio-Formats.
|
|
5
5
|
Author-email: Nick Schaub <nick.schaub@nih.gov>, Sameeul Bashir Samee <sameeul.samee@axleinfo.com>
|
|
6
6
|
Maintainer-email: Sameeul Bashir Samee <sameeul.samee@axleinfo.com>
|
|
@@ -38,16 +38,17 @@ License-File: LICENSE
|
|
|
38
38
|
Requires-Dist: imagecodecs>=2021.2.26
|
|
39
39
|
Requires-Dist: numpy
|
|
40
40
|
Requires-Dist: ome-types>=0.4.2
|
|
41
|
-
Requires-Dist: zarr
|
|
41
|
+
Requires-Dist: zarr<3,>=2.6.1
|
|
42
42
|
Requires-Dist: scyjava
|
|
43
43
|
Requires-Dist: jpype1
|
|
44
44
|
Requires-Dist: tifffile>=2022.8.12
|
|
45
45
|
Requires-Dist: bfiocpp
|
|
46
46
|
Provides-Extra: dev
|
|
47
47
|
Requires-Dist: ome_zarr; extra == "dev"
|
|
48
|
+
Requires-Dist: pillow; extra == "dev"
|
|
48
49
|
Requires-Dist: requests>=2.26.0; extra == "dev"
|
|
49
50
|
|
|
50
|
-
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.
|
|
51
|
+
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.7)
|
|
51
52
|
|
|
52
53
|
[](https://bfio.readthedocs.io/en/latest/?badge=latest)
|
|
53
54
|
[](https://pypi.org/project/bfio/)
|
|
@@ -99,15 +100,15 @@ be installed using pip:
|
|
|
99
100
|
|
|
100
101
|
## Docker
|
|
101
102
|
|
|
102
|
-
### polusai/bfio:2.4.
|
|
103
|
+
### polusai/bfio:2.4.7
|
|
103
104
|
|
|
104
105
|
Ubuntu based container with bfio and all dependencies (including Java).
|
|
105
106
|
|
|
106
|
-
### polusai/bfio:2.4.
|
|
107
|
+
### polusai/bfio:2.4.7-imagej
|
|
107
108
|
|
|
108
109
|
Same as above, except comes with ImageJ and PyImageJ.
|
|
109
110
|
|
|
110
|
-
### polusai/bfio:2.4.
|
|
111
|
+
### polusai/bfio:2.4.7-tensorflow
|
|
111
112
|
|
|
112
113
|
Tensorflow container with bfio installed.
|
|
113
114
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.
|
|
1
|
+
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.7)
|
|
2
2
|
|
|
3
3
|
[](https://bfio.readthedocs.io/en/latest/?badge=latest)
|
|
4
4
|
[](https://pypi.org/project/bfio/)
|
|
@@ -50,15 +50,15 @@ be installed using pip:
|
|
|
50
50
|
|
|
51
51
|
## Docker
|
|
52
52
|
|
|
53
|
-
### polusai/bfio:2.4.
|
|
53
|
+
### polusai/bfio:2.4.7
|
|
54
54
|
|
|
55
55
|
Ubuntu based container with bfio and all dependencies (including Java).
|
|
56
56
|
|
|
57
|
-
### polusai/bfio:2.4.
|
|
57
|
+
### polusai/bfio:2.4.7-imagej
|
|
58
58
|
|
|
59
59
|
Same as above, except comes with ImageJ and PyImageJ.
|
|
60
60
|
|
|
61
|
-
### polusai/bfio:2.4.
|
|
61
|
+
### polusai/bfio:2.4.7-tensorflow
|
|
62
62
|
|
|
63
63
|
Tensorflow container with bfio installed.
|
|
64
64
|
|
|
@@ -7,7 +7,7 @@ requires = [
|
|
|
7
7
|
"imagecodecs>=2021.2.26",
|
|
8
8
|
"numpy",
|
|
9
9
|
"ome-types>=0.4.2",
|
|
10
|
-
"zarr>=2.6.1",
|
|
10
|
+
"zarr>=2.6.1,<3",
|
|
11
11
|
"scyjava",
|
|
12
12
|
"jpype1",
|
|
13
13
|
"tifffile>=2022.8.12",
|
|
@@ -23,7 +23,7 @@ dependencies = [
|
|
|
23
23
|
"imagecodecs>=2021.2.26",
|
|
24
24
|
"numpy",
|
|
25
25
|
"ome-types>=0.4.2",
|
|
26
|
-
"zarr>=2.6.1",
|
|
26
|
+
"zarr>=2.6.1,<3",
|
|
27
27
|
"scyjava",
|
|
28
28
|
"jpype1",
|
|
29
29
|
"tifffile>=2022.8.12",
|
|
@@ -56,6 +56,7 @@ requires-python = ">=3.8"
|
|
|
56
56
|
[project.optional-dependencies]
|
|
57
57
|
dev = [
|
|
58
58
|
"ome_zarr",
|
|
59
|
+
"pillow",
|
|
59
60
|
"requests>=2.26.0"
|
|
60
61
|
]
|
|
61
62
|
|
|
@@ -86,7 +87,7 @@ namespaces = false
|
|
|
86
87
|
|
|
87
88
|
|
|
88
89
|
[tool.bumpversion]
|
|
89
|
-
current_version = "2.4.
|
|
90
|
+
current_version = "2.4.7"
|
|
90
91
|
commit = true
|
|
91
92
|
tag = true
|
|
92
93
|
commit_args = "--no-verify"
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
2.4.7
|
|
@@ -988,17 +988,7 @@ try:
|
|
|
988
988
|
|
|
989
989
|
def _read_image(self, X, Y, Z, C, T, output):
|
|
990
990
|
out = self._image
|
|
991
|
-
|
|
992
|
-
channel.samples_per_pixel > 1
|
|
993
|
-
for channel in self.frontend.metadata.images[0].pixels.channels
|
|
994
|
-
)
|
|
995
|
-
|
|
996
|
-
interleaved = False
|
|
997
|
-
if (
|
|
998
|
-
self.frontend.metadata.images[0].pixels.interleaved
|
|
999
|
-
or pseudo_interleaved
|
|
1000
|
-
):
|
|
1001
|
-
interleaved = True
|
|
991
|
+
interleaved = self.frontend.metadata.images[0].pixels.interleaved
|
|
1002
992
|
|
|
1003
993
|
self._prev_read_cached_loc = None
|
|
1004
994
|
self._cached_read_data = None
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.2
|
|
2
2
|
Name: bfio
|
|
3
|
-
Version: 2.4.
|
|
3
|
+
Version: 2.4.7
|
|
4
4
|
Summary: Simple reading and writing classes for tiled tiffs using Bio-Formats.
|
|
5
5
|
Author-email: Nick Schaub <nick.schaub@nih.gov>, Sameeul Bashir Samee <sameeul.samee@axleinfo.com>
|
|
6
6
|
Maintainer-email: Sameeul Bashir Samee <sameeul.samee@axleinfo.com>
|
|
@@ -38,16 +38,17 @@ License-File: LICENSE
|
|
|
38
38
|
Requires-Dist: imagecodecs>=2021.2.26
|
|
39
39
|
Requires-Dist: numpy
|
|
40
40
|
Requires-Dist: ome-types>=0.4.2
|
|
41
|
-
Requires-Dist: zarr
|
|
41
|
+
Requires-Dist: zarr<3,>=2.6.1
|
|
42
42
|
Requires-Dist: scyjava
|
|
43
43
|
Requires-Dist: jpype1
|
|
44
44
|
Requires-Dist: tifffile>=2022.8.12
|
|
45
45
|
Requires-Dist: bfiocpp
|
|
46
46
|
Provides-Extra: dev
|
|
47
47
|
Requires-Dist: ome_zarr; extra == "dev"
|
|
48
|
+
Requires-Dist: pillow; extra == "dev"
|
|
48
49
|
Requires-Dist: requests>=2.26.0; extra == "dev"
|
|
49
50
|
|
|
50
|
-
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.
|
|
51
|
+
# **B**io**F**ormats **I**nput/**O**utput utility (bfio 2.4.7)
|
|
51
52
|
|
|
52
53
|
[](https://bfio.readthedocs.io/en/latest/?badge=latest)
|
|
53
54
|
[](https://pypi.org/project/bfio/)
|
|
@@ -99,15 +100,15 @@ be installed using pip:
|
|
|
99
100
|
|
|
100
101
|
## Docker
|
|
101
102
|
|
|
102
|
-
### polusai/bfio:2.4.
|
|
103
|
+
### polusai/bfio:2.4.7
|
|
103
104
|
|
|
104
105
|
Ubuntu based container with bfio and all dependencies (including Java).
|
|
105
106
|
|
|
106
|
-
### polusai/bfio:2.4.
|
|
107
|
+
### polusai/bfio:2.4.7-imagej
|
|
107
108
|
|
|
108
109
|
Same as above, except comes with ImageJ and PyImageJ.
|
|
109
110
|
|
|
110
|
-
### polusai/bfio:2.4.
|
|
111
|
+
### polusai/bfio:2.4.7-tensorflow
|
|
111
112
|
|
|
112
113
|
Tensorflow container with bfio installed.
|
|
113
114
|
|
|
@@ -5,6 +5,8 @@ import bfio
|
|
|
5
5
|
import numpy as np
|
|
6
6
|
import pickle
|
|
7
7
|
import random
|
|
8
|
+
import tifffile
|
|
9
|
+
from PIL import Image
|
|
8
10
|
import zarr
|
|
9
11
|
from ome_zarr.utils import download as zarr_download
|
|
10
12
|
|
|
@@ -457,3 +459,37 @@ class TestBioReaderPickle(unittest.TestCase):
|
|
|
457
459
|
assert unpickled_rdr.Y == img_height
|
|
458
460
|
assert unpickled_rdr[:].sum() == data_sum
|
|
459
461
|
unpickled_rdr.close()
|
|
462
|
+
|
|
463
|
+
|
|
464
|
+
class TestMultiChannelBioformats(unittest.TestCase):
|
|
465
|
+
|
|
466
|
+
def test_multi_channel_bioformats(self):
|
|
467
|
+
|
|
468
|
+
# Set image dimensions
|
|
469
|
+
width, height = 256, 256
|
|
470
|
+
|
|
471
|
+
# Create random 3-channel image data
|
|
472
|
+
random_image_data = np.random.randint(
|
|
473
|
+
0, 256, (height, width, 3), dtype=np.uint8
|
|
474
|
+
)
|
|
475
|
+
|
|
476
|
+
# Save interleaved TIFF (RGBRGB...)
|
|
477
|
+
interleaved_image = Image.fromarray(random_image_data, mode="RGB")
|
|
478
|
+
interleaved_image.save(TEST_DIR.joinpath("interleaved.tiff"))
|
|
479
|
+
|
|
480
|
+
# Create non-interleaved data (separate planes for R, G, B)
|
|
481
|
+
non_interleaved_data = np.moveaxis(
|
|
482
|
+
random_image_data, 2, 0
|
|
483
|
+
) # Shape: (3, height, width)
|
|
484
|
+
|
|
485
|
+
# Save non-interleaved TIFF
|
|
486
|
+
with tifffile.TiffWriter(TEST_DIR.joinpath("non_interleaved.tiff")) as tif:
|
|
487
|
+
tif.write(non_interleaved_data, photometric="rgb")
|
|
488
|
+
|
|
489
|
+
with bfio.BioReader(TEST_DIR.joinpath("non_interleaved.tiff")) as br:
|
|
490
|
+
for c in range(br.C):
|
|
491
|
+
assert (br[:, :, :, c] - random_image_data[:, :, c]).sum() == 0
|
|
492
|
+
|
|
493
|
+
with bfio.BioReader(TEST_DIR.joinpath("interleaved.tiff")) as br:
|
|
494
|
+
for c in range(br.C):
|
|
495
|
+
assert (br[:, :, :, c] - non_interleaved_data[c, :, :]).sum() == 0
|
bfio-2.4.5/src/bfio/VERSION
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
2.4.5
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|