Update pre-commit hooks by mhsmith · Pull Request #137591 · python/cpython

mhsmith · 2025-08-09T17:25:05Z

Split from #137186. That PR no longer needs the zizmor update, but since I've worked out exactly how to do it, we might as well merge it anyway.

hugovk · 2025-08-10T08:47:15Z

Let's update the other .pre-commit-config.yaml hooks as well by running pre-commit autoupdate --jobs 0.

We're on Ruff v0.11.8.

Ruff 0.12.* gives out a lot of syntax errors, for example: "invalid-syntax: Cannot use type alias statement on Python 3.10 (syntax was added in Python 3.12)"

If you like we can leave those for another time and just bump to to the latest 0.11: v0.11.13.

mhsmith · 2025-08-10T10:06:47Z

Ruff 0.12.* gives out a lot of syntax errors, for example: "invalid-syntax: Cannot use type alias statement on Python 3.10 (syntax was added in Python 3.12)"

I fixed this by specifying the target Python version.

hugovk · 2025-08-10T12:02:16Z

.pre-commit-config.yaml

      - id: ruff
        name: Run Ruff (lint) on Lib/test/
-        args: [--exit-non-zero-on-fix]
+        args: [--exit-non-zero-on-fix, --target-version=py313]


I guess a low version was initially chosen to make backports easier?

Anyway, let's move the config to a .ruff.toml file so it also applies if running Ruff directly.

Suggested change

args: [--exit-non-zero-on-fix, --target-version=py313]

args: [--exit-non-zero-on-fix]

We have a top-level that defines target-version = "py310".

Let's override that in Lib/test/.ruff.toml, either:

target-version = "py313" like in Doc/.ruff.toml

[per-file-target-version] like in Tools/build/.ruff.toml (might be too files many to be worth it)

And we can also remove the t-string files from extend-exclude and put those under [per-file-target-version] for py314.

(Could do the same for test_grammar.py but it has some F811 errors that would need deciding about.)

hugovk

Thank you!

AA-Turner

We can be a little more conservative here:

Lib/test/.ruff.toml

bedevere-app · 2025-08-10T20:07:04Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

mhsmith · 2025-08-10T22:12:04Z

I have made the requested changes; please review again.

bedevere-app · 2025-08-10T22:12:09Z

Thanks for making the requested changes!

@AA-Turner, @hugovk: please review the changes made to this pull request.

AA-Turner

Cheers

miss-islington-app · 2025-08-10T22:32:53Z

Thanks @mhsmith for the PR, and @AA-Turner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

(cherry picked from commit b36d23f) Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

miss-islington-app · 2025-08-10T22:33:00Z

Sorry, @mhsmith and @AA-Turner, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker b36d23f58e8ab85b8576ab59c2ce72572c2cb12a 3.13

bedevere-app · 2025-08-10T22:33:03Z

GH-137621 is a backport of this pull request to the 3.14 branch.

Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> (cherry picked from commit b36d23f)

bedevere-app · 2025-08-11T10:19:57Z

GH-137641 is a backport of this pull request to the 3.14 branch.

bedevere-app · 2025-08-11T15:31:31Z

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

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> (cherry picked from commit b36d23f)

(cherry picked from commit b36d23f) Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

bedevere-bot · 2025-08-12T12:09:38Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot iOS ARM64 Simulator 3.13 (tier-3) has failed when building commit 5d64571.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1386/builds/1530) and take a look at the build logs.
Check if the failure is related to this commit (5d64571) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1386/builds/1530

Failed tests:

test_socketserver

Failed subtests:

test_UnixDatagramServer - test.test_socketserver.SocketServerTest.test_UnixDatagramServer

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/threading.py", line 1043, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/threading.py", line 994, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 240, in serve_forever
    self._handle_request_noblock()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 320, in _handle_request_noblock
    self.handle_error(request, client_address)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 318, in _handle_request_noblock
    self.process_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 349, in process_request
    self.finish_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 362, in finish_request
    self.RequestHandlerClass(request, client_address, self)
    ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 768, in __init__
    self.finish()
    ~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 863, in finish
    self.socket.sendto(self.wfile.getvalue(), self.client_address)
    ~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ConnectionResetError: [Errno 54] Connection reset by peer
ERROR


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 222, in test_UnixDatagramServer
    self.run_server(socketserver.UnixDatagramServer,
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    socketserver.DatagramRequestHandler,
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    self.dgram_examine)
                    ^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/support/threading_helper.py", line 66, in decorator
    return func(*args)
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 133, in run_server
    testfunc(svrcls.address_family, addr)
    ~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 160, in dgram_examine
    buf = data = receive(s, 100)
                 ~~~~~~~^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 43, in receive
    raise RuntimeError("timed out on %r" % (sock,))
RuntimeError: timed out on <socket.socket fd=31, family=1, type=2, proto=0, laddr=./test_python_pmk5csn_.sock>


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 222, in test_UnixDatagramServer
    self.run_server(socketserver.UnixDatagramServer,
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    socketserver.DatagramRequestHandler,
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    self.dgram_examine)
                    ^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/support/threading_helper.py", line 66, in decorator
    return func(*args)
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 133, in run_server
    testfunc(svrcls.address_family, addr)
    ~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 160, in dgram_examine
    buf = data = receive(s, 100)
                 ~~~~~~~^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/BC99FB54-7DA1-44B4-AE19-F8178A18EC35/data/Containers/Bundle/Application/E558837D-1277-4A40-A506-9968B4BB6A8B/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 43, in receive
    raise RuntimeError("timed out on %r" % (sock,))
RuntimeError: timed out on <socket.socket fd=31, family=1, type=2, proto=0, laddr=./test_python_16zmlugj.sock>

hugovk · 2025-08-12T12:14:00Z

ConnectionResetError: [Errno 54] Connection reset by peer, unrelated.

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Update to zizmor version 1.11.0

394fff6

mhsmith requested review from AA-Turner, ezio-melotti and hugovk as code owners August 9, 2025 17:25

mhsmith added skip issue skip news needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Aug 9, 2025

bedevere-app bot added the awaiting review label Aug 9, 2025

mhsmith mentioned this pull request Aug 9, 2025

gh-137242: Add Android CI job #137186

Merged

StanFromIreland added OS-android infra CI, GitHub Actions, buildbots, Dependabot, etc. and removed OS-android labels Aug 9, 2025

Update all other hooks

61e2c30

mhsmith changed the title ~~Update to zizmor version 1.11.0~~ Update pre-commit hooks Aug 10, 2025

hugovk reviewed Aug 10, 2025

View reviewed changes

Move target-version from .pre-commit-config to Lib/test/.ruff.toml

f90d169

mhsmith requested a review from AlexWaygood as a code owner August 10, 2025 15:49

hugovk approved these changes Aug 10, 2025

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting review labels Aug 10, 2025

AA-Turner requested changes Aug 10, 2025

View reviewed changes

Lib/test/.ruff.toml Outdated Show resolved Hide resolved

Lib/test/.ruff.toml Show resolved Hide resolved

bedevere-app bot added awaiting changes and removed awaiting merge labels Aug 10, 2025

Reduce target-version to py312

15c384b

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

bedevere-app bot removed the awaiting changes label Aug 10, 2025

bedevere-app bot added the awaiting change review label Aug 10, 2025

bedevere-app bot requested review from AA-Turner and hugovk August 10, 2025 22:12

AA-Turner approved these changes Aug 10, 2025

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting change review labels Aug 10, 2025

AA-Turner enabled auto-merge (squash) August 10, 2025 22:15

AA-Turner merged commit b36d23f into python:main Aug 10, 2025
45 of 48 checks passed

bedevere-app bot removed the awaiting merge label Aug 10, 2025

bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Aug 10, 2025

hugovk pushed a commit that referenced this pull request Aug 11, 2025

[3.14] Update pre-commit hooks (GH-137591) (#137621)

1bf7462

Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

webknjaz pushed a commit to webknjaz/cpython that referenced this pull request Aug 11, 2025

Update pre-commit hooks (python#137591)

3c62614

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> (cherry picked from commit b36d23f)

webknjaz mentioned this pull request Aug 11, 2025

[3.13] Update pre-commit hooks (GH-137591) #137641

Merged

mhsmith removed the needs backport to 3.13 bugs and security fixes label Aug 11, 2025

webknjaz pushed a commit to webknjaz/cpython that referenced this pull request Aug 11, 2025

Update pre-commit hooks (python#137591)

304412e

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> (cherry picked from commit b36d23f)

encukou pushed a commit that referenced this pull request Aug 12, 2025

[3.13] Update pre-commit hooks (GH-137591) (GH-137641)

5d64571

(cherry picked from commit b36d23f) Co-authored-by: Malcolm Smith <smith@chaquo.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025

Update pre-commit hooks (python#137591)

782f760

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

hugovk mentioned this pull request Feb 10, 2026

Ruff erroneously flagging modern syntax as syntax errors due to targeting Python 3.12 #144639

Closed

	args: [--exit-non-zero-on-fix, --target-version=py313]
	args: [--exit-non-zero-on-fix]

Uh oh!

Conversation

mhsmith commented Aug 9, 2025

Uh oh!

hugovk commented Aug 10, 2025

Uh oh!

mhsmith commented Aug 10, 2025

Uh oh!

hugovk Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

mhsmith Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

hugovk left a comment

Choose a reason for hiding this comment

Uh oh!

AA-Turner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bedevere-app bot commented Aug 10, 2025

Uh oh!

mhsmith commented Aug 10, 2025

Uh oh!

bedevere-app bot commented Aug 10, 2025

Uh oh!

AA-Turner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

miss-islington-app bot commented Aug 10, 2025

Uh oh!

miss-islington-app bot commented Aug 10, 2025

Uh oh!

bedevere-app bot commented Aug 10, 2025

Uh oh!

bedevere-app bot commented Aug 11, 2025

Uh oh!

bedevere-app bot commented Aug 11, 2025

Uh oh!

bedevere-bot commented Aug 12, 2025

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

hugovk commented Aug 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments