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

Fix typos #123775

Merged
merged 15 commits into from
Sep 9, 2024
Merged

Fix typos #123775

merged 15 commits into from
Sep 9, 2024

Conversation

algonell
Copy link
Contributor

@algonell algonell commented Sep 6, 2024

Fix typos in documentation, comments, etc.

Copy link

cpython-cla-bot bot commented Sep 6, 2024

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app
Copy link

bedevere-app bot commented Sep 6, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@picnixz
Copy link
Contributor

picnixz commented Sep 6, 2024

For the configure script and other files, you should instead use make regen-configure and make regen-all to be sure that all files are up-to-date.

.github/workflows/build.yml Outdated Show resolved Hide resolved
@picnixz
Copy link
Contributor

picnixz commented Sep 8, 2024

@algonell Maybe I wasn't clear enough but by make regen-all, I meant that you needed to run them locally. This will produce new files (namely, a new configure script will be generated automatically).

Note that you either need podman or docker to regenerate the configure script since it depends on a speciifc version of autoconf. If you have trouble with this, I can make it myself and open a pull request on your branch so that you can update it (but everytime you make a change to configure.ac, I'll need to re-generate the files).

On platforms with shell scripts (Linux/MacOS), you can do the following:

./Tools/build/regen-configure.sh     # create an up-to-date 'configure'
./configure                          # create an up-to-date 'Makefile'
make -j12 regen-all

Then, you can verify the result via git status. If everything worked well, you should have some new files to commit. Once you've committed them and pushed them, the CI should be green.


Slightly off-topic, but you don't need to merge main into your branch unless you have conflicts. This will notify people watching the PR (like me) and we think that there is a relevant commit to actually review again.

@algonell
Copy link
Contributor Author

algonell commented Sep 8, 2024

My bad, one of my cleanups (occurence -> occurrence) was in aclocal.m4 (which is generated).

Thank for your patience and the detailed explanation!

@picnixz
Copy link
Contributor

picnixz commented Sep 8, 2024

It's fine, took me a while as well in the beginning to see that I needed to regen configure with a specific version of autoconf...

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

Changes on Objects/mimalloc/ should be made upstream in the https://github.com/microsoft/mimalloc/ project.

Copy link
Contributor

@picnixz picnixz left a comment

Choose a reason for hiding this comment

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

Out of curiosity, how do you look for spelling mistakes? do you use hunspell or aspell (or something else?)

@vstinner vstinner merged commit 9017b95 into python:main Sep 9, 2024
47 checks passed
vstinner pushed a commit to vstinner/cpython that referenced this pull request Sep 9, 2024
(cherry picked from commit 9017b95)
@bedevere-app
Copy link

bedevere-app bot commented Sep 9, 2024

GH-123866 is a backport of this pull request to the 3.13 branch.

@bedevere-app
Copy link

bedevere-app bot commented Sep 9, 2024

GH-123867 is a backport of this pull request to the 3.12 branch.

@vstinner
Copy link
Member

vstinner commented Sep 9, 2024

Usually, I dislike backporting such changes to stable branches. But since this change modifies many files, I prefer to backport it to reduce the risk of conflicts of future backports.

@vstinner
Copy link
Member

vstinner commented Sep 9, 2024

Merged, thanks.

vstinner pushed a commit to vstinner/cpython that referenced this pull request Sep 9, 2024
(cherry picked from commit 9017b95)
@algonell
Copy link
Contributor Author

algonell commented Sep 9, 2024

Out of curiosity, how do you look for spelling mistakes? do you use hunspell or aspell (or something else?)

@picnixz it's codespell

vstinner added a commit that referenced this pull request Sep 9, 2024
Fix typos (#123775)

(cherry picked from commit 9017b95)

Co-authored-by: algonell <algonell@gmail.com>
@terryjreedy
Copy link
Member

"you don't need to merge main into your branch unless you have conflicts." One does if one wants to test a revised PR against current main on one's own machine before pushing to github. However, one should 'git merge upstream/main' and not force-push. And testing is not an issue for typos in comments and docstrings.

vstinner added a commit that referenced this pull request Oct 7, 2024
Fix typos (#123775)

(cherry picked from commit 9017b95)

Co-authored-by: algonell <algonell@gmail.com>
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