search

xia2 / screen19

Screening program for small-molecule single-crystal X-ray diffraction data
https://pypi.org/project/screen19/
BSD 3-Clause "New" or "Revised" License
2 stars 3 forks source link

Retire DIALS 1.14 support #25

Closed benjaminhwilliams closed 4 years ago

benjaminhwilliams commented 4 years ago

When DIALS 1.14 gets EOLed and we are confident no-one is packaging screen19 with it, retire support for DIALS v < 2.0.

Fixes #23.

benjaminhwilliams commented 4 years ago

I left this dormant some time ago but it's probably ready to go if all known popular DIALS distributions are 2.x.

benjaminhwilliams commented 4 years ago

Ugh, sorry @Anthchirp, maybe I jumped the gun. I thought CCP4 7.1 (with DIALS 2.something) had been released, but I now see it hasn't been and CCP4 is still running on DIALS 1.14.

benjaminhwilliams commented 4 years ago

Alright, this seems to pass all tests locally on my machine. Unfortunately, the CI checks are beset by upstream problems. I've fixed the Python 2 builds. The remaining Travis failures are a consequence of upstream DIALS build problems (themselves a consequence of https://github.com/cctbx/cctbx_project/issues/487).

It seems unwise to keep this PR open for too much longer as merge conflicts creep in. I don't think DIALS 1.14 is supported any longer and CCP4 7.1 has been released with DIALS 2.2, so we should be OK to merge this. I'll hold it for a day or so in case someone addresses the CCTBX issue as it would be nice to see the CI checks succeeding.

Anthchirp commented 4 years ago

this still (partially?) retires Python 2 support, eg. removes from __future__ imports etc. Is this still intended to be installable on DIALS 2.2+Python 2?

benjaminhwilliams commented 4 years ago

Ah yes, good spot, thanks. I think when I first put this together, I misunderstood the Python 2 support plans to mean that DIALS 2 would be Python 3 only. I'll reinstate the from future imports. Is there anything else you spotted? I didn't notice anything else from skimming back over it.