search

cctbx / cctbx_project

Computational Crystallography Toolbox
https://cci.lbl.gov/docs/cctbx
Other
207 stars 111 forks source link

MMTBX: remove comparison of int with NoneType #969

Closed benjaminhwilliams closed 2 months ago

benjaminhwilliams commented 4 months ago

Fix a couple of places in mmtbx.scaling where the attribute of a class, initially set to None, is implicitly expected to have since become an int. There are seemingly valid paths through the code in which the attribute values remain None, so this leads to a comparison TypeError. Removing these code paths seems pretty trivial.

@phyy-nx and I stubbed our toes on this last week when trying to run xia2.multiplex, of which MMTBX is a dependency.

I've no idea why tests are failing in the CI. They don't, at first glance, seem to be related to these changes. @bkpoon, could you please advise as to how you would like me to proceed?

benjaminhwilliams commented 4 months ago

@phyy-nx, I notice that the only CI failures are XFEL CI. I don't think I know how to run these locally. Does this change set concern you?

benjaminhwilliams commented 2 months ago

Thanks, looks good to me!

Apologies @bkpoon, I missed your review. Belatedly merging.