Skip to content

Commit

Permalink
Merge pull request #964 from pyiron/dependabot/pip/numpy-1.24.1
Browse files Browse the repository at this point in the history
Bump numpy from 1.23.5 to 1.24.1
  • Loading branch information
jan-janssen authored Jan 7, 2023
2 parents 465a587 + d938670 commit f9c3aa9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- gitpython =3.1.30
- h5io =0.1.7
- h5py =3.7.0
- numpy =1.23.5
- numpy =1.24.1
- pandas =1.5.2
- pathlib2 =2.3.7.post1
- pint =0.20.1
Expand Down
5 changes: 4 additions & 1 deletion pyiron_base/storage/hdfio.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ def _is_convertable_dtype_object_array(obj):
# TODO: remove this function upon 1.0.0 release
@staticmethod
def _convert_dtype_obj_array(obj: np.ndarray):
result = np.array(obj.tolist())
try:
result = np.array(obj.tolist())
except ValueError:
result = np.array(obj.tolist(), dtype=object)
if result.dtype != np.dtype(object):
state.logger.warning(
f"Deprecated data structure! "
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
'gitpython==3.1.30',
'h5io==0.1.7',
'h5py==3.7.0',
'numpy==1.23.5',
'numpy==1.24.1',
'pandas==1.5.2',
'pathlib2==2.3.7.post1',
'pint==0.20.1',
Expand Down

0 comments on commit f9c3aa9

Please sign in to comment.