From f30f780a792b6a5d740494852e4c5592a82d41aa Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 31 Oct 2024 15:04:50 +0100 Subject: [PATCH 1/3] gh-126206: make clinic now forcefully regenerates clinic code --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index aa7fa4e29d84c2..8bfdc5d33df30d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -904,7 +904,7 @@ coverage-report: regen-token regen-frozen # Run "Argument Clinic" over all source files .PHONY: clinic clinic: check-clean-src - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --exclude Lib/test/clinic.test.c --srcdir $(srcdir) + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f --make --exclude Lib/test/clinic.test.c --srcdir $(srcdir) .PHONY: clinic-tests clinic-tests: check-clean-src $(srcdir)/Lib/test/clinic.test.c From eee4104d26a7dfdb65f11897aed09fe65aec4b2a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 31 Oct 2024 15:37:14 +0100 Subject: [PATCH 2/3] Add NEWS --- .../next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst diff --git a/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst b/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst new file mode 100644 index 00000000000000..31c5b73f251dea --- /dev/null +++ b/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst @@ -0,0 +1,2 @@ +``make clinic`` now runs Argument Clinic using the ``-f`` option, thus +forcefully regenerating generated code. From 48f1c820dd1591630f4a4f86c660ab870d1e4195 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 1 Nov 2024 08:47:22 +0100 Subject: [PATCH 3/3] Address review: use long options for clarity Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- Makefile.pre.in | 2 +- .../next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 8bfdc5d33df30d..b0263f9f4c21da 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -904,7 +904,7 @@ coverage-report: regen-token regen-frozen # Run "Argument Clinic" over all source files .PHONY: clinic clinic: check-clean-src - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f --make --exclude Lib/test/clinic.test.c --srcdir $(srcdir) + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --force --make --exclude Lib/test/clinic.test.c --srcdir $(srcdir) .PHONY: clinic-tests clinic-tests: check-clean-src $(srcdir)/Lib/test/clinic.test.c diff --git a/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst b/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst index 31c5b73f251dea..24b172e1747403 100644 --- a/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst +++ b/Misc/NEWS.d/next/Build/2024-10-31-15-37-05.gh-issue-126206.oC6z2i.rst @@ -1,2 +1,2 @@ -``make clinic`` now runs Argument Clinic using the ``-f`` option, thus -forcefully regenerating generated code. +``make clinic`` now runs Argument Clinic using the ``--force`` option, +thus forcefully regenerating generated code.