FABLE-3DXRD / ImageD11

ImageD11 is a python code for identifying individual grains in spotty area detector X-ray diffraction images.
https://imaged11.readthedocs.io/
GNU General Public License v2.0
15 stars 25 forks source link

Moving many functions from nbgui into ImageD11 #261

Closed jadball closed 8 months ago

jadball commented 8 months ago

Apologies for the monster commit! Key highlights below:

All the diffs should be readable aside from grain.py which I accidentally linted (sorry!) - look at the bottom of the file for new stuff added.

jadball commented 8 months ago

This seems to be failing due to a missing hdf5plugin on py 2.7 - @jonwright any ideas? I can push a new commit in this PR to fix if you know how

jadball commented 8 months ago

I think the problem is that dataset.py now imports properties.py which needs hdf5plugin for its IO functions. We are only just now seeing this issue on Python 2.7 because we have some tests in test_datasets.py that are now indirectly targeting code with HDF5 I/O

jadball commented 8 months ago

This may be solved by adding hdf5plugin as an explicit dependency to ImageD11?

jonwright commented 8 months ago

We should have hdf5plugin in setup.py already: 'hdf5plugin==1.4.1 ; python_version < "3" and sys_platform == "win32" ', 'hdf5plugin ; python_version >= "3" ',

jonwright commented 8 months ago

But I guess there is a bug there as it has nothing for python2 on non-windows...

jonwright commented 8 months ago

I will merge and attempt to fix the CI later, the problem is not related...