Skip to content

bpo-39349: Add cancel_futures to Executor.shutdown base class #22023

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

Merged
merged 2 commits into from
Sep 1, 2020

Conversation

hauntsaninja
Copy link
Contributor

@hauntsaninja hauntsaninja commented Aug 31, 2020

@hauntsaninja
Copy link
Contributor Author

hauntsaninja commented Aug 31, 2020

cc @aeros

Seems like we can skip news, since the parameter is new in 3.9. We should also backport to 3.9.

@aeros aeros added skip news needs backport to 3.9 only security fixes labels Aug 31, 2020
@aeros aeros self-requested a review August 31, 2020 22:51
@aeros aeros changed the title bpo-39349: Add cancel_futures to Executor.shutdown bpo-39349: Add cancel_futures to Executor.shutdown base class Sep 1, 2020
Copy link
Contributor

@aeros aeros left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @hauntsaninja! I've edited the title slightly to reflect that it's adding cancel_futures to the base class so that the title is more distinct original PR that added the feature. Other than that, it looks good to me. I'll restart the CI by reopening and closing since the failures look to be entirely unrelated (I opened a separate issue for the test_asyncio failure in the Windows CI).

@hauntsaninja
Copy link
Contributor Author

Thanks! It looks like the only CI failures currently are the doctest ones, which there's a python-dev thread about: https://mail.python.org/archives/list/[email protected]/thread/KMXK6BQWQZRR2TGVRLECMR7CUVIVTUMQ/

@aeros
Copy link
Contributor

aeros commented Sep 1, 2020

Thanks! It looks like the only CI failures currently are the doctest ones, which there's a python-dev thread about:

@hauntsaninja No problem. I just read that thread recently, and was about to give an update. I believe the travis failure is also due to it, seeing as its specifically the documentation test failing in the build stage. So I would try pushing a non-functional commit (add some whitespace to between words in the docstring, or between the last word and the period of a sentence) to cause travis to use the older version of setuptools for the doctest. We can also just wait on the fix for setuptools, and then close/re-open the PR later; I'll leave it up to you.

(I'm unable to merge until at least all of the required checks are passing.)

@aeros
Copy link
Contributor

aeros commented Sep 1, 2020

Thanks! I'll proceed with merging.

@aeros aeros merged commit 17dc1b7 into python:master Sep 1, 2020
@miss-islington
Copy link
Contributor

Thanks @hauntsaninja for the PR, and @aeros for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @hauntsaninja and @aeros, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 17dc1b789ecc33b4a254eb3b799085f4b3624ca5 3.9

@hauntsaninja hauntsaninja deleted the cancelparam branch September 1, 2020 21:18
@aeros
Copy link
Contributor

aeros commented Sep 1, 2020

@hauntsaninja If you'd like to manually work on backporting to 3.9 with cherry_picker, feel free to @ mention me in the PR. If you're unfamiliar with this process, it's described in a section of the devguide.

hauntsaninja added a commit to hauntsaninja/cpython that referenced this pull request Sep 1, 2020
…ythonGH-22023)

* Add cancel_futures parameter to the Executor base class, since it was missed in the original PR (python#18057) that added cancel_futures.
(cherry picked from commit 17dc1b7)

Co-authored-by: Shantanu <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 1, 2020
@bedevere-bot
Copy link

GH-22048 is a backport of this pull request to the 3.9 branch.

@hauntsaninja
Copy link
Contributor Author

Sure, opened #22048

aeros pushed a commit that referenced this pull request Sep 2, 2020
…H-22023) (GH-22048)

* Add cancel_futures parameter to the Executor base class, since it was missed in the original PR (#18057) that added cancel_futures.
(cherry picked from commit 17dc1b7)
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
…GH-22023)

* Add cancel_futures parameter to the Executor base class, since it was missed in the original PR (python#18057) that added cancel_futures.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants