Closed Addimator closed 2 months ago
So, I think I have reasonably resolved the conflicts with the latest main branch. Let's see if the tests pass -- if they don't, I'll try to resolve remaining issues.
Afterwards, I think we should still:
common.smk
's all_input()
functionJust had a quick look, and apart from the things you list, I think you caught all of the other comments. I think all this weirdness in where this appear or don't really comes from this whole pending
issue. I think I initially also had some review comments pending before I did the last round of reviews. And with some of your comments also pending and you applying fixes in the meantime, I think that a bunch of the references to lines and other comments just got jumbled.
So maybe you can go through this on Monday, until you are satisfied with the result. And then I will do a fresh round of review, that hopefully offers a less confusing experience for us both. Sorry for my part in causing the confusion here, but I think we're almost through... :sweat_smile:
Just wanted to give you a heads-up that I am planning to merge another pull request tomorrow, which will change the datavzrd templates and update to the latest version of the datavzrd wrapper: #92
If you need me to look into updating this branch after the merge, let me know. All the changes are still fresh in my mind, so I should be reasonably confident in resolving conflicts that might arise.