Skip to content

Commit a4ceedb

Browse files
committed
workaround for a pandas bug on Windows
pandas-dev/pandas#60145 this has been fixed, but not released
1 parent eeb2c44 commit a4ceedb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

servalcat/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
Mozilla Public License, version 2.0; see LICENSE.
77
"""
88

9-
__version__ = '0.4.97'
10-
__date__ = '2024-11-23'
9+
__version__ = '0.4.98'
10+
__date__ = '2024-12-02'

servalcat/utils/hkl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def correlation(obs, calc):
2727
return numpy.corrcoef(obs[sel], calc[sel])[0,1]
2828

2929
def df_from_asu_data(asu_data, label):
30-
df = pandas.DataFrame(data=asu_data.miller_array,
30+
df = pandas.DataFrame(data=asu_data.miller_array.astype(numpy.int32),
3131
columns=["H","K","L"])
3232
if type(asu_data) is gemmi.ValueSigmaAsuData:
3333
df[label] = to64(asu_data.value_array[:,0])
@@ -37,7 +37,7 @@ def df_from_asu_data(asu_data, label):
3737
return df
3838

3939
def df_from_raw(miller_array, value_array, label):
40-
df = pandas.DataFrame(data=miller_array,
40+
df = pandas.DataFrame(data=miller_array.astype(numpy.int32),
4141
columns=["H","K","L"])
4242
df[label] = to64(value_array)
4343
return df

0 commit comments

Comments
 (0)