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.

Sign up for GitHub

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

Jump to bottom

Fixes in sorting descriptions #18317

Merged
merged 3 commits into from
Feb 3, 2020
Merged

Fixes in sorting descriptions #18317

merged 3 commits into from
Feb 3, 2020

Conversation

pochmann
Copy link
Contributor

@pochmann pochmann commented Feb 2, 2020 •
edited by miss-islington

Improvements in listsort.txt and a comment in sortperf.py.

Automerge-Triggered-By: @csabella

@pochmann
Fix power of 2.
ef9e177
@pochmann
Fixed typo.
15146e2
@pochmann
Fix misleading sentence
22d8ec3 
- merge_collapse isn't always about merging the new run with preceding runs. For example [64, 32, 65] (where 65 is the new run) becomes [96, 65] by merging only the preceding runs and not merging the new run.
- It's not just called to "see whether it should merge" but also to actually merge.
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@pochmann

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@csabella csabella requested a review from tim-one February 2, 2020 23:20
tim-one
tim-one approved these changes Feb 3, 2020
View reviewed changes
Copy link
Member

@tim-one tim-one left a comment

Choose a reason for hiding this comment

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

Looks good! Thank you 😄

@csabella
Copy link
Contributor

csabella commented Feb 3, 2020

@pochmann, thank you for the contribution. This will merge automatically once the CLA is signed.

@miss-islington miss-islington merged commit 24e5ad4 into python:master Feb 3, 2020
@miss-islington
Copy link
Contributor

Thanks @pochmann for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

I'm having trouble backporting to 3.8. Reason: 'Error 110 while writing to socket. Connection timed out.'. Please retry by removing and re-adding the needs backport to 3.8 label.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 3, 2020
@pochmann @miss-islington
Fixes in sorting descriptions (pythonGH-18317)
ac07873 
Improvements in listsort.txt and a comment in sortperf.py.

Automerge-Triggered-By: @csabella
(cherry picked from commit 24e5ad4)

Co-authored-by: Stefan Pochmann <stefan.pochmann@gmail.com>
@bedevere-bot
Copy link

GH-18333 is a backport of this pull request to the 3.7 branch.

miss-islington added a commit that referenced this pull request Feb 4, 2020
@miss-islington @pochmann
Fixes in sorting descriptions (GH-18317)
fda6593 
Improvements in listsort.txt and a comment in sortperf.py.

Automerge-Triggered-By: @csabella
(cherry picked from commit 24e5ad4)

Co-authored-by: Stefan Pochmann <stefan.pochmann@gmail.com>
@csabella csabella added needs backport to 3.8 only security fixes and removed needs backport to 3.8 only security fixes labels Feb 4, 2020
@miss-islington
Copy link
Contributor

Thanks @pochmann for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-18339 is a backport of this pull request to the 3.8 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Feb 4, 2020
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 4, 2020
@pochmann @miss-islington
Fixes in sorting descriptions (pythonGH-18317)
b6a291b 
Improvements in listsort.txt and a comment in sortperf.py.

Automerge-Triggered-By: @csabella
(cherry picked from commit 24e5ad4)

Co-authored-by: Stefan Pochmann <stefan.pochmann@gmail.com>
miss-islington added a commit that referenced this pull request Feb 4, 2020
@miss-islington @pochmann
Fixes in sorting descriptions (GH-18317)
a0389ba 
Improvements in listsort.txt and a comment in sortperf.py.

Automerge-Triggered-By: @csabella
(cherry picked from commit 24e5ad4)

Co-authored-by: Stefan Pochmann <stefan.pochmann@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tim-one tim-one tim-one approved these changes

Assignees
No one assigned
Labels
skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@pochmann @the-knights-who-say-ni @csabella @miss-islington @bedevere-bot @tim-one @corona10