Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.0 pending PRs #4539

Open
1 task
IAlibay opened this issue Mar 29, 2024 · 7 comments
Open
1 task

Merge 3.0 pending PRs #4539

IAlibay opened this issue Mar 29, 2024 · 7 comments
Labels
Milestone

Comments

@IAlibay
Copy link
Member

IAlibay commented Mar 29, 2024

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

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

@IAlibay IAlibay added this to the Release 3.0 milestone Mar 29, 2024
@IAlibay
Copy link
Member Author

IAlibay commented Mar 29, 2024

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.

@orbeckst
Copy link
Member

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
Copy link
Member

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

@IAlibay
Copy link
Member Author

IAlibay commented Mar 30, 2024

@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.

@orbeckst
Copy link
Member

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
Copy link
Member

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).

@IAlibay
Copy link
Member Author

IAlibay commented Mar 30, 2024

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants