From 861e4aef8e1ddcd8da0f21a1f6f4d3bc5848b02e Mon Sep 17 00:00:00 2001 From: 1313e Date: Tue, 28 Jul 2020 17:24:26 +1000 Subject: [PATCH] Updated legacy v3 to v3.4.8. --- hickle/legacy_v3/__version__.py | 2 +- hickle/legacy_v3/hickle.py | 1 + hickle/legacy_v3/loaders/load_astropy.py | 4 ++-- .../{hickle_3_4_7.hkl => hickle_3_4_8.hkl} | Bin 16504 -> 16504 bytes 4 files changed, 4 insertions(+), 3 deletions(-) rename hickle/tests/legacy_hkls/{hickle_3_4_7.hkl => hickle_3_4_8.hkl} (97%) diff --git a/hickle/legacy_v3/__version__.py b/hickle/legacy_v3/__version__.py index f06b6161..df6da975 100644 --- a/hickle/legacy_v3/__version__.py +++ b/hickle/legacy_v3/__version__.py @@ -10,4 +10,4 @@ # %% VERSIONS # Default/Latest/Current version -__version__ = '3.4.7' +__version__ = '3.4.8' diff --git a/hickle/legacy_v3/hickle.py b/hickle/legacy_v3/hickle.py index 2c432832..0179835d 100644 --- a/hickle/legacy_v3/hickle.py +++ b/hickle/legacy_v3/hickle.py @@ -171,6 +171,7 @@ def file_opener(f, mode='r', track_times=True): if isinstance(f, (file, io.TextIOWrapper, io.BufferedWriter)): filename, mode = f.name, f.mode f.close() + mode = mode.replace('b', '') h5f = h5.File(filename, mode) elif isinstance(f, string_like_types): filename = f diff --git a/hickle/legacy_v3/loaders/load_astropy.py b/hickle/legacy_v3/loaders/load_astropy.py index d0901381..17ca3d4c 100644 --- a/hickle/legacy_v3/loaders/load_astropy.py +++ b/hickle/legacy_v3/loaders/load_astropy.py @@ -55,7 +55,7 @@ def create_astropy_skycoord(py_obj, h_group, call_id=0, **kwargs): # kwarg compression etc does not work on scalars lat = py_obj.data.lat.value lon = py_obj.data.lon.value - dd = np.column_stack((lon, lat)) + dd = np.stack((lon, lat), axis=-1) d = h_group.create_dataset('data_%i' % call_id, data=dd, dtype='float64') #, **kwargs) @@ -171,7 +171,7 @@ def load_astropy_skycoord_dataset(h_node): py_type, data = get_type_and_data(h_node) lon_unit = h_node.attrs["lon_unit"][0] lat_unit = h_node.attrs["lat_unit"][0] - q = SkyCoord(data[:,0], data[:, 1], unit=(lon_unit, lat_unit)) + q = SkyCoord(data[..., 0], data[..., 1], unit=(lon_unit, lat_unit)) return q def load_astropy_constant_dataset(h_node): diff --git a/hickle/tests/legacy_hkls/hickle_3_4_7.hkl b/hickle/tests/legacy_hkls/hickle_3_4_8.hkl similarity index 97% rename from hickle/tests/legacy_hkls/hickle_3_4_7.hkl rename to hickle/tests/legacy_hkls/hickle_3_4_8.hkl index 62ca665feeedee78b99a5c3db95ccfd739fc4b47..976ced42ba35dd494bcd0dc791307c37aff46fa8 100644 GIT binary patch delta 74 zcmey-!1$wqaf1y9qs3-h4t+6}>`U_Tn+xRDutHc0Dm8o%)&e6HHZW_lgRIQvCl&`F PDkc}m$!tDiw}lY^(lr`^ delta 74 zcmey-!1$wqaf1y9qxoiA4t+6}pO@amZ7z^o!wO+3sMPR5SPP6)*ubpG4ze