@@ -246,7 +246,7 @@ def format(*, format_all=False):
246246 changed = modified_files ()
247247
248248 format_all = format_all or os .environ .get ("FORMAT_ALL" , "" ).lower () == "true"
249- if "requirements/tools.txt" in changed :
249+ if Path ( "requirements/tools.txt" ) in changed :
250250 # We've changed the tools, which includes a lot of our formatting
251251 # logic, so we need to rerun formatters.
252252 format_all = True
@@ -257,6 +257,10 @@ def format(*, format_all=False):
257257 py_paths_to_format = [p for p in sorted (paths ) if p .suffix == ".py" ]
258258 rust_paths_to_format = [p for p in sorted (paths ) if p .suffix == ".rs" ]
259259
260+ if any (p .parts [0 ] == ".github" and p .suffix == ".yml" for p in paths ):
261+ # Autofix what we can in our workflows; `lint` reports whatever is left.
262+ pip_tool ("zizmor" , "--fix" , "--no-exit-codes" , ".github/" )
263+
260264 if not (py_paths_to_format or rust_paths_to_format or doc_paths_to_format ):
261265 return
262266
@@ -486,7 +490,7 @@ def update_python_versions():
486490DJANGO_VERSIONS = {
487491 "5.2" : "5.2.17" ,
488492 "6.0" : "6.0.8" ,
489- "6.1" : "6.1" ,
493+ "6.1" : "6.1.1 " ,
490494}
491495
492496
@@ -704,6 +708,10 @@ def has_diff(file_or_directory):
704708def upgrade_requirements ():
705709 update_vendored_files ()
706710 compile_requirements (upgrade = True )
711+ update_python_versions ()
712+ update_pyodide_versions ()
713+ update_django_versions ()
714+ update_gha_pins ()
707715 # Reformat every file, not just changed ones: upgrading the formatters in
708716 # tools.txt can change how they format files we didn't otherwise touch, and
709717 # we want those changes in this PR rather than leaking into a later one.
@@ -716,10 +724,6 @@ def upgrade_requirements():
716724 msg = get_autoupdate_message (domainlist_changed = has_diff (DOMAINS_LIST ))
717725 with open (RELEASE_FILE , mode = "w" , encoding = "utf-8" ) as f :
718726 f .write (f"RELEASE_TYPE: patch\n \n { msg } " )
719- update_python_versions ()
720- update_pyodide_versions ()
721- update_django_versions ()
722- update_gha_pins ()
723727 subprocess .call (["git" , "add" , "." ], cwd = ROOT )
724728
725729
@@ -820,8 +824,8 @@ def run_tox(task, version, *args, profile="dev"):
820824 "3.13" : "3.13.15" ,
821825 "3.14" : "3.14.7" ,
822826 "3.14t" : "3.14.7+freethreaded" ,
823- "3.15" : "3.15.0rc1 " ,
824- "3.15t" : "3.15.0rc1 +freethreaded" ,
827+ "3.15" : "3.15.0rc2 " ,
828+ "3.15t" : "3.15.0rc2 +freethreaded" ,
825829 "pypy3.11" : "pypy3.11-3.11.15" ,
826830}
827831ci_version_python = (
0 commit comments