Skip to content

test: reinstate 'deflate', now that it works on MacOS #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2024
Merged

test: reinstate 'deflate', now that it works on MacOS #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f656e59
test: reinstate 'deflate', now that it works on MacOS
jpivarski May 7, 2024
de24f66
Merge branch 'main' into jpivarski/undo-PR-1203
jpivarski May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/uproot/_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import numbers
import os
import re
import sys
import warnings
from collections.abc import Iterable
from pathlib import Path
Expand All @@ -28,8 +27,6 @@
import uproot.source.fsspec
import uproot.source.object

macos = sys.platform == "darwin"


def tobytes(array):
"""
Expand Down
3 changes: 1 addition & 2 deletions tests/test_0008_start_interpretation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def test_file_header(use_isal):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_file_header(use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.use_deflate = use_deflate
filename = skhep_testdata.data_path("uproot-Zmumu.root")
Expand Down
21 changes: 7 additions & 14 deletions tests/test_0416_writing_compressed_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ def test_ZLIB(use_isal):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_deflate(use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -134,8 +133,7 @@ def test_histogram_ZLIB(tmp_path, use_isal):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_histogram_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -593,8 +591,7 @@ def test_multicompression_5(tmp_path, use_isal):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_multicompression_1_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -628,8 +625,7 @@ def test_multicompression_1_deflate(tmp_path, use_deflate):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_multicompression_2_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -662,8 +658,7 @@ def test_multicompression_2_deflate(tmp_path, use_deflate):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_multicompression_3_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -697,8 +692,7 @@ def test_multicompression_3_deflate(tmp_path, use_deflate):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_multicompression_4_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down Expand Up @@ -730,8 +724,7 @@ def test_multicompression_4_deflate(tmp_path, use_deflate):

@pytest.mark.parametrize("use_deflate", [False, True])
def test_multicompression_5_deflate(tmp_path, use_deflate):
# FIXME: https://github.com/dcwatson/deflate/issues/42
if use_deflate and not uproot._util.macos:
if use_deflate:
pytest.importorskip("deflate")
uproot.ZLIB.library = "deflate"
else:
Expand Down