diff --git a/cellprofiler_core/measurement/_measurements.py b/cellprofiler_core/measurement/_measurements.py index 70effc00..1896fed0 100644 --- a/cellprofiler_core/measurement/_measurements.py +++ b/cellprofiler_core/measurement/_measurements.py @@ -226,7 +226,7 @@ def initialize(self, measurement_columns): def fix_type(t): if t == "integer": - return numpy.int + return int if t.startswith("varchar"): len = t.split("(")[1][:-1] return numpy.dtype("a" + len) diff --git a/cellprofiler_core/utilities/hdf5_dict.py b/cellprofiler_core/utilities/hdf5_dict.py index d79cac8a..0e96eb40 100644 --- a/cellprofiler_core/utilities/hdf5_dict.py +++ b/cellprofiler_core/utilities/hdf5_dict.py @@ -1182,7 +1182,7 @@ def add_files_to_filelist(self, urls): marker = 'REPLACE' inserted = numpy.insert(existing_meta, insertion_indexes, marker).tolist() inserted = [x if isinstance(x, numpy.ndarray) else blank_metadata for x in inserted] - metadataset[:] = numpy.array(inserted, dtype=numpy.object) + metadataset[:] = numpy.array(inserted, dtype=object) # Now we insert the series name fields. seriesnameset[:] = numpy.insert(existing_names, insertion_indexes, blank_names) else: @@ -1212,7 +1212,7 @@ def add_files_to_filelist(self, urls): maxshape=(None, ) ) md[:] = numpy.array([blank_metadata] * len(filenames), - dtype=numpy.object) + dtype=object) self.hdf5_file.flush() self.notify() diff --git a/tests/modules/test_loaddata.py b/tests/modules/test_loaddata.py index f9d7b918..49fd7b5f 100644 --- a/tests/modules/test_loaddata.py +++ b/tests/modules/test_loaddata.py @@ -245,7 +245,7 @@ def test_int_image_measurement(): pipeline, module, filename = make_pipeline(csv_text) m = pipeline.run() data = m.get_current_image_measurement("Test_Measurement") - assert isinstance(data, numpy.integer), "data is type %s, not np.int" % (type(data)) + assert isinstance(data, numpy.integer), "data is type %s, not int" % (type(data)) assert data == 1 os.remove(filename)