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

PEP 680: Format rst/PEP and copyedit for grammar, clarity & phrasing #2233

Merged
merged 3 commits into from
Jan 13, 2022

Conversation

CAM-Gerlach
Copy link
Member

CC: @hauntsaninja @hukkin @encukou @pradyunsg

As requested previously, I performed a copyedit of the text to fix a number of typos and grammar issues, use easy to read, idiomatic, appropriate and precise phrasing, explicitly clarify a number of points, re-order a few parts for more logical flow, avoid repetition, and other improvements. As a separate commit, I also performed some formatting and small textual tweaks per the rst, PEP 1 and PEP 12 conventions, as well as general correctness, consistency and readability. If you don't like any of changes, just let me know and I'm happy to explain them, propose something different, or revert if necessary. Thanks!

pep-0680.rst Outdated
/,
*,
parse_float: Callable[[str], Any] = ...,
) -> dict[str, Any]: ...
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
) -> dict[str, Any]: ...
) -> dict[str, Any]: ...

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, somehow missed that one, thanks. Fixed.

pep-0680.rst Outdated
`changelog <https://github.com/toml-lang/toml/blob/master/CHANGELOG.md>`_, we
see TOML has had no major changes since April 2020 and has had two releases in
the last five years.
The release of TOML 1.0 in January 2021 indicates the TOML format should
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
The release of TOML 1.0 in January 2021 indicates the TOML format should
The release of TOML 1.0.0 in January 2021 indicates the TOML format should

The release is actually 1.0.0. Not sure how important detail this is. Also if we want to refer to the major version (>=1,<2) then maybe use v1?

Thanks for the PR, by the way, this is great! 😃

Copy link
Member Author

@CAM-Gerlach CAM-Gerlach Jan 13, 2022

Choose a reason for hiding this comment

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

I was just drawing on my experience for which sounded the most idiomatic, what was generally used on the TOML spec repo, and the fact that "TOML 1.0" indicated approximately the correct degree of version precision for most usages, but you're right that it isn't strictly correct. To address this, I changed usages (like this one) that referred to the specific version to 1.0.0, and to the 1.x major version series in general to 1.x.

Pinging @pradyunsg in case you have any further input here before this gets merged

Copy link
Member

Choose a reason for hiding this comment

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

What you've done sounds about right to me.

I'll likely be cutting 1.0.1 at some point this year, so... there's that. :)

Copy link
Contributor

@hauntsaninja hauntsaninja left a comment

Choose a reason for hiding this comment

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

Thanks, left some comments, feel free to ignore anything!

pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
pep-0680.rst Outdated Show resolved Hide resolved
@gvanrossum
Copy link
Member

Pleas at-mention a pep editor when you need help merging.

Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Co-authored-by: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
@CAM-Gerlach
Copy link
Member Author

@hukkin @hauntsaninja Please re-review!

Copy link
Contributor

@hauntsaninja hauntsaninja left a comment

Choose a reason for hiding this comment

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

Thank you, lgtm!

@hukkin
Copy link
Contributor

hukkin commented Jan 13, 2022

Looks good to me too, thanks!

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.

7 participants