Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gemd/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.2.3"
__version__ = "2.2.4"
4 changes: 3 additions & 1 deletion gemd/entity/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ def array_like():
import numpy as np
try:
import pandas as pd
_array_like = (list, tuple, np.ndarray, pd.core.base.PandasObject)
_array_like = (list, tuple, np.ndarray,
pd.core.base.PandasObject,
pd.api.extensions.ExtensionArray)
except ImportError: # pragma: no cover
_array_like = (list, tuple, np.ndarray) # pragma: no cover
except ImportError: # pragma: no cover
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ exclude = ["docs", "tests"]
dev = [
"flake8==7.0.0",
"flake8-docstrings==1.7.0",
"numpy==1.24.4; python_version<'3.10'",
"pandas==2.0.3; python_version<'3.10'",
"numpy>=2.0.2,<=2.1.0; python_version>='3.10'",
"pandas==2.3.0; python_version>='3.10'",
"numpy>=1.24.4; python_version<'3.10'",
"pandas>=2.0.3; python_version<'3.10'",
"numpy>=2.0.2,<3; python_version>='3.10'",
"pandas>=2.3.0,<4; python_version>='3.10'",
"pytest==8.4.2",
"pytest-cov==7.0.0",
"derp==0.1.1",
Expand Down
5 changes: 4 additions & 1 deletion tests/entity/bounds/test_categorical_bounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_json():

def test_numpy():
"""Test that ndarrays, Series work as well."""
assert len(array_like()) < 5 # In case we extend at some point
assert len(array_like()) < 6 # In case we extend at some point

if len(array_like()) > 2: # Test numpy
import numpy as np
Expand All @@ -75,3 +75,6 @@ def test_numpy():
pd_bounds = CategoricalBounds(pd.Series(["spam", "eggs"]))
pd_copy = loads(dumps(pd_bounds))
assert pd_copy == pd_bounds

pd_unique = CategoricalBounds(pd.Series(["spam", "eggs"]).unique())
assert pd_copy == pd_unique
2 changes: 1 addition & 1 deletion tests/entity/bounds/test_composition_bounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_json():

def test_numpy():
"""Test that ndarrays, Series work as well."""
assert len(array_like()) < 5 # In case we extend at some point
assert len(array_like()) < 6 # In case we extend at some point

if len(array_like()) > 2: # Test numpy
import numpy as np
Expand Down
Loading