No not a problem at all, we are looking forward to the merge.
To avoid breaking the versions in the master branch until development and first testings are completed, we shifted our major development to the SPHIRE_release_1.2_preparations branch. However, I merge the master branch on a daily bases, so that it is not diverging.
We plan to finish the major changes over the weekend, so that we can merge back into master at the beginning of next week.
Our GUI's are now qt4 and qt5 compatible (after we do the merge) and tested with the master branch as well as the PyQt5 branch, so we do not expect any problems after the merge.
Best,
Markus
________________________________________
Von: eman2-de...@googlegroups.com <eman2-de...@googlegroups.com> im Auftrag von Steve Ludtke <slud...@gmail.com>
Gesendet: Donnerstag, 28. Februar 2019 07:28
An: eman2-de...@googlegroups.com
Betreff: [eman2-developers] Merging PyQt5
conda install qt=5
--
You received this message because you are subscribed to the Google Groups "EMAN2 and SPARX Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to eman2-develope...@googlegroups.com.
To post to this group, send email to eman2-de...@googlegroups.com.
Visit this group at https://groups.google.com/group/eman2-developers.
For more options, visit https://groups.google.com/d/optout.