mdanalysis icon indicating copy to clipboard operation
mdanalysis copied to clipboard

Merge 3.0 pending PRs

Open IAlibay opened this issue 1 year ago • 7 comments

Here is a list of PRs that need merging for the 3.0 release (but not before):

  • [ ] https://github.com/MDAnalysis/mdanalysis/pull/4532#issuecomment-2021634120

note: please edit directly and add to this list as necessary

IAlibay avatar Mar 29 '24 16:03 IAlibay

I'll open up a separate discussion later so we can work out a strategy. I'm concerned we will end up in unmergable situations if we're not careful.

IAlibay avatar Mar 29 '24 16:03 IAlibay

Good idea!

I initially thought that the basic guessers PR #3753 would also need to go onto this list but IIRC, it does everything in a backwards-compatible manner and thus can go into 2.8.0.

orbeckst avatar Mar 29 '24 18:03 orbeckst

Once #4311 is addressed in a PR, it also needs to go here.

orbeckst avatar Mar 29 '24 22:03 orbeckst

@orbeckst please let's discuss the strategy before we add a bunch of things here and make the merge headache bigger than it needs to.

IAlibay avatar Mar 30 '24 05:03 IAlibay

My point was that there are a number of things that will need to be done for 3.0 but not before (like the removals). We need to keep track of these things somehow and the issues are the way we do this. Opening the issues doesn't mean that we should be opening PRs immediately.

It was a good idea to open this issue to keep track of anything that's currently un-mergable.

orbeckst avatar Mar 30 '24 16:03 orbeckst

Note on all the "removal issues": We should only create PRs once the next release is 3.0. Right now these issues are just for book-keeping purposes (and so that we can close other issues for deprecations).

orbeckst avatar Mar 30 '24 16:03 orbeckst

@orbeckst I think I understand what you mean. We might have different views on what this issue is - I take this one as "for PRs that were opened before we got to the next release being 3.0", i.e. folks are welcome to action them now and leave the PR open for a while.

I think there will be cases where this will be fine because there will be no merge conflict (a removal that doesn't touch CI or packaging for example). Another example is when there's just a really complicated PR and someone working on it now is better than doing it just before 3.0 and we just agree to deal with the merge conflict because that's easier than doing the PR.

IAlibay avatar Mar 30 '24 16:03 IAlibay