Skip to content

/ cpython

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

Improve grammar in the import system reference documentation #18209

Merged
merged 2 commits into from Jan 30, 2020
Merged

Improve grammar in the import system reference documentation #18209

merged 2 commits into from Jan 30, 2020
+1 −1

Conversation

@Bonifacio2
Copy link
Contributor

Bonifacio2 commented Jan 27, 2020 •
edited by Mariatta

Replaced the period with a comma.

Automerge-Triggered-By: @Mariatta
@Bonifacio2
fix typo
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
fa0799a
@the-knights-who-say-ni

This comment has been minimized.

Sign in to view
Copy link

the-knights-who-say-ni commented Jan 27, 2020

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:

@Bonifacio2

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!
@cjw296
cjw296 reviewed Jan 28, 2020
View changes
Doc/reference/import.rst Outdated
@@ -857,7 +857,7 @@ module. ``find_spec()`` returns a fully populated spec for the module.
This spec will always have "loader" set (with one exception).

To indicate to the import machinery that the spec represents a namespace
:term:`portion`. the path entry finder sets "loader" on the spec to
:term:`portion` the path entry finder sets "loader" on the spec to

This comment has been minimized.

Sign in to view
Copy link
@cjw296

cjw296 Jan 28, 2020

Contributor

This should be a comma, not a space.
@brandtbucher
brandtbucher suggested changes Jan 28, 2020
View changes
Copy link
Member

brandtbucher left a comment

Thanks for your time @Bonifacio2, and welcome to CPython! 😎

I assume that you've seen the bot's message about the CLA?
Doc/reference/import.rst Outdated Show resolved Hide resolved
@Bonifacio2 @brandtbucher
fix typo on Doc/reference/import.rst
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4845c3b 
Co-Authored-By: Brandt Bucher <brandtbucher@gmail.com>
@Bonifacio2

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Bonifacio2 commented Jan 28, 2020

Thanks for your time @Bonifacio2, and welcome to CPython! 😎

I assume that you've seen the bot's message about the CLA?

Yes, I saw it. I already created my b.p.o account, set the github account, signed the agreement, received my certificate, but https://check-python-cla.herokuapp.com/ still says I haven't signed the CLA.
@brandtbucher

This comment has been minimized.

Sign in to view
Copy link
Member

brandtbucher commented Jan 28, 2020 •
edited

Okay, I'd give it a business day or two then before it's marked as received. It's my understanding that they're processed manually by a human at the PSF.
@Mariatta
Mariatta approved these changes Jan 28, 2020
View changes
Copy link
Member

Mariatta left a comment

Thanks!
@Bonifacio2

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Bonifacio2 commented Jan 28, 2020

Hello, @Mariatta . Should I open the backport PRs for the 3.7 and 3.8 branches now or should I wait for this to be merged?
@brandtbucher

This comment has been minimized.

Sign in to view
Copy link
Member

brandtbucher commented Jan 28, 2020

The bot will open them automatically. Your work here is done!
@cjw296

This comment has been minimized.

Sign in to view
Copy link
Contributor

cjw296 commented Jan 28, 2020

@Mariatta - where can I find out what the automerge tag does? How come I appear to be able to merge this PR even though CLA is still not signed?
@Mariatta Mariatta changed the title fix typo Improve grammar in the import system reference documentation Jan 29, 2020
@Mariatta

This comment has been minimized.

Sign in to view
Copy link
Member

Mariatta commented Jan 29, 2020

@cjw296 The PR will be automatically merged by @miss-islington if all of the following are true:

  • PR has automerge label
  • PR has CLA signed label
  • PR has awaiting merge label (has been reviewed and approved by a core dev)
  • all checks and tests in the PR have passed
  • PR does not have DO NOT MERGE label

Additionally, automerge takes care of replacing the "#NNNN" into "GH-NNNN" in the commit message.
Automerge also uses the PR description and PR body as the commit message. This is helpful in case of multiple commits in PR.

Through GitHub web UI, the only restriction it has is that you must have commit right, and that all checks pass. Core dev can use their own judgement and bypass the CLA check if they see fit. In the past, some of us would bypass CLA check if it is simple typo fixes. Personally for me though, I rather have CLA always signed, and let the bot do the merging.

Hope this helps.
@cjw296

This comment has been minimized.

Sign in to view
Copy link
Contributor

cjw296 commented Jan 29, 2020

perfect, thankyou!
@miss-islington miss-islington merged commit d47d0c8 into python:master Jan 30, 2020
5 checks passed
5 checks passed
Docs
Details
Azure Pipelines PR #20200128.37 succeeded
Details
bedevere/issue-number Issue report skipped
bedevere/news "skip news" label found
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Jan 30, 2020

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

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Jan 30, 2020

GH-18268 is a backport of this pull request to the 3.8 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 30, 2020
@Bonifacio2 @miss-islington
Improve grammar in the import system reference documentation (pythonG…
25f081e 
…H-18209)

Replaced the period with a comma.

Automerge-Triggered-By: @Mariatta
(cherry picked from commit d47d0c8)

Co-authored-by: Bonifacio de Oliveira <bonifacio.segundo@gmail.com>
@bedevere-bot

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Jan 30, 2020

GH-18269 is a backport of this pull request to the 3.7 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 30, 2020
@Bonifacio2 @miss-islington
Improve grammar in the import system reference documentation (pythonG…
9481d9f 
…H-18209)

Replaced the period with a comma.

Automerge-Triggered-By: @Mariatta
(cherry picked from commit d47d0c8)

Co-authored-by: Bonifacio de Oliveira <bonifacio.segundo@gmail.com>
@brandtbucher

This comment has been minimized.

Sign in to view
Copy link
Member

brandtbucher commented Jan 30, 2020

Congrats on your first CPython contribution @Bonifacio2! 🍾

Looking forward to seeing more from you in the future.
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
@Bonifacio2 @shihai1991
Improve grammar in the import system reference documentation (pythonG…
7ccff0c 
…H-18209)

Replaced the period with a comma.

Automerge-Triggered-By: @Mariatta
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjw296 cjw296

@brandtbucher brandtbucher

@Mariatta Mariatta

Assignees
No one assigned
Labels
🤖 automerge CLA signed skip issue skip news type-documentation
Projects
None yet
Milestone
No milestone
8 participants
@Bonifacio2 @the-knights-who-say-ni @brandtbucher @cjw296 @Mariatta @miss-islington @bedevere-bot @csabella
You can’t perform that action at this time.