Skip to content

Commit 7f94df0

Browse files
authored
TST:merge: Handle rasterio 1.4 merge test differences (#818)
1 parent f3ad955 commit 7f94df0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

test/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "test_data")
1616
TEST_INPUT_DATA_DIR = os.path.join(TEST_DATA_DIR, "input")
1717
TEST_COMPARE_DATA_DIR = os.path.join(TEST_DATA_DIR, "compare")
18+
RASTERIO_GE_14 = version.parse(rasterio.__version__) >= version.parse("1.4.0")
1819
GDAL_GE_36 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.0")
1920
GDAL_GE_361 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.1")
2021
GDAL_GE_364 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.4")

test/integration/test_integration_merge.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from rioxarray import open_rasterio
88
from rioxarray.merge import merge_arrays, merge_datasets
9-
from test.conftest import TEST_INPUT_DATA_DIR
9+
from test.conftest import RASTERIO_GE_14, TEST_INPUT_DATA_DIR
1010

1111

1212
@pytest.mark.parametrize("squeeze", [True, False])
@@ -82,7 +82,10 @@ def test_merge__different_crs(dataset):
8282
(-7300984.0238134, 5003618.5908794, -7224054.1109682, 5050108.6101528),
8383
)
8484
assert merged.rio.shape == (84, 139)
85-
assert_almost_equal(test_sum, -131734881)
85+
if RASTERIO_GE_14:
86+
assert_almost_equal(test_sum, -126821853)
87+
else:
88+
assert_almost_equal(test_sum, -131734881)
8689

8790
assert_almost_equal(
8891
tuple(merged.rio.transform()),

0 commit comments

Comments
 (0)