Skip to content

Conversation

@Wulian233
Copy link
Contributor

@Wulian233Wulian233 commented May 25, 2024

Skip issue and news


📚 Documentation preview 📚: https://cpython-previews--119539.org.readthedocs.build/

@Wulian233
Copy link
ContributorAuthor

Wulian233 commented May 25, 2024

Oh NO. There was an accident, my last not merge PR changed files was added here

I was revert it, unittestgui.py looks no change, but show in file changed list

@nineteendo
Copy link
Contributor

I think we can add skip issue and news.

@Wulian233
Copy link
ContributorAuthor

Wulian233 commented May 25, 2024

I'm not sure layout.html should keep 3.13(dev), I deleted (dev) to 3.13

Co-authored-by: Nice Zombies <nineteendo19d0@gmail.com>
@Wulian233
Copy link
ContributorAuthor

See #119541
layout.html -> js
Do the layout.html changes here need cancel? Add 3.14 in the #119541 ?

@nineteendo
Copy link
Contributor

You can wait to see which pull request is merged first.

@hugovk
Copy link
Member

unittestgui.py looks no change, but show in file changed list

Please delete unittestgui.py from the PR, or I can do it for you if you like?

See #119541 layout.html -> js
Do the layout.html changes here need cancel?
Add 3.14 in the #119541 ?

It makes more sense to add 3.14 to layout.html here, so #119541 is just moving code, not adding to it. We can resolve conflicts later.

@Wulian233
Copy link
ContributorAuthor

Wulian233 commented May 25, 2024

unittestgui.py looks no change, but show in file changed list

Please delete unittestgui.py from the PR, or I can do it for you if you like?

Can you help me delete the unittestgui.py, thx☺️

@hugovk
Copy link
Member

Done, or rather what was needed was to re-add the x permission.

@nineteendo
Copy link
Contributor

Ah wow, '100644' -> '100755' is the change in the mode of the file.
Wouldn't '-rw-r--r--' -> '-rwxr-xr-x' be more readable?

@terryjreedy
Copy link
Member

Remove idlelib/help.html from this PR. The change is wrong. I presume you can just revert the corresponding commit.

I believe your DPI commit was included because you made the change to main rather than a dpi branch.

@Wulian233
Copy link
ContributorAuthor

Wulian233 commented May 25, 2024

Yes I made the change to main instead dpi branch:( and I have revert the help.html

@terryjreedy
Copy link
Member

@hugovk Can you either handle this or ping someone else?

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovkhugovk changed the title Update Readme and others from 3.13 to 3.14Update README and layout.html from 3.13 to 3.14May 26, 2024
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Copy link
Member

@hugovkhugovk left a comment

Choose a reason for hiding this comment

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

Thanks!

@hugovkhugovk enabled auto-merge (squash) May 26, 2024 11:24
@hugovkhugovk merged commit b5b7dc9 into python:mainMay 26, 2024
@Wulian233Wulian233 deleted the readme branch July 2, 2024 13:41
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
Co-authored-by: Nice Zombies <nineteendo19d0@gmail.com> Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sign up for freeto 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

@Wulian233@nineteendo@hugovk@terryjreedy@Eclips4