search

pypi / warehouse

The Python Package Index
https://pypi.org
Apache License 2.0
3.58k stars 964 forks source link

Enable merge queue? #12972

Open alex opened 1 year ago

alex commented 1 year ago

https://github.blog/changelog/2023-02-08-pull-request-merge-queue-public-beta/

This may be able to help with the frustration of needing to constantly rebase PRs.

dstufft commented 1 year ago

I've gone ahead and enabled the merge queue on Warehouse.

That means you can freely hit the "Merge When Ready" button when a PR is ready to merge, regardless of whether the branch is up to date with main or not.

I left the settings at their default, which means GitHub will do the above described behavior for up to 5 PRs at a time, after that any remaining PRs will still be queued but will wait until one of the other PRs finish building up. We can tweak the concurrency to whatever number we want, but 5 was the default.

It's also set to a minimum batch size of 1 (which I think definitely makes sense, we aren't a busy enough repo to where a batch size of 1 would be a waste), once a PR has passed it will wait up to 5 minutes (also configurable) to see if any other PRs in the merge queue (up to 5, again configurable) finish their test runs so that it can batch multiple PR merges into one push into main.

ewdurbin commented 1 year ago

Reopening. We've disabled merge queues after getting a bit beat up by the beta costs.

Lets reassess when the feature stabilizes.