From dc292aad82d3f9d24e8f3167efb00ffc621861a9 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:44:04 +0800 Subject: [PATCH 1/8] Update tcltk.wixproj Add turtle.py --- Tools/msi/tcltk/tcltk.wixproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/msi/tcltk/tcltk.wixproj b/Tools/msi/tcltk/tcltk.wixproj index 218f3d15ec88fc..c8b7ab77c4dc6b 100644 --- a/Tools/msi/tcltk/tcltk.wixproj +++ b/Tools/msi/tcltk/tcltk.wixproj @@ -28,7 +28,7 @@ tcltk_lib - $(PySourcePath) !(bindpath.src) @@ -39,4 +39,4 @@ - \ No newline at end of file + From 39fd1231a21a39c5682449104afc1917a859f705 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:47:21 +0800 Subject: [PATCH 2/8] Update Default.wxl Add turtle --- Tools/msi/bundle/Default.wxl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl index 49f681d3e11d2e..99a3fcdf721d04 100644 --- a/Tools/msi/bundle/Default.wxl +++ b/Tools/msi/bundle/Default.wxl @@ -70,8 +70,8 @@ Select Customize to review current options. Installs the Python documentation files. &pip Installs pip, which can download and install other Python packages. - tcl/tk and &IDLE - Installs tkinter and the IDLE development environment. + tcl/tk, turtle and &IDLE + Installs tkinter, turtle and the IDLE development environment. Python &test suite Installs the standard library test suite. py &launcher From cd547969e22b759bd46dc58a8c9396bdc9361d62 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Wed, 30 Oct 2024 19:57:46 +0800 Subject: [PATCH 3/8] Update Tools/msi/bundle/Default.wxl Capitalize Tcl and Tk Co-authored-by: Wulian <1055917385@qq.com> --- Tools/msi/bundle/Default.wxl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl index 99a3fcdf721d04..7208d83ddae61b 100644 --- a/Tools/msi/bundle/Default.wxl +++ b/Tools/msi/bundle/Default.wxl @@ -70,7 +70,7 @@ Select Customize to review current options. Installs the Python documentation files. &pip Installs pip, which can download and install other Python packages. - tcl/tk, turtle and &IDLE + Tcl/Tk, turtle and &IDLE Installs tkinter, turtle and the IDLE development environment. Python &test suite Installs the standard library test suite. From d681748bfd274eb8340e4d4dc0dfb37593470e86 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 09:46:54 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst diff --git a/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst new file mode 100644 index 00000000000000..8ff3a116ff4afa --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst @@ -0,0 +1 @@ +Add turtle.py into Tcl/Tk installation option From 59343468cbddb8783fdb25649fc60a82686f075a Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Thu, 31 Oct 2024 17:49:43 +0800 Subject: [PATCH 5/8] Update lib.wixproj --- Tools/msi/lib/lib.wixproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/msi/lib/lib.wixproj b/Tools/msi/lib/lib.wixproj index 26311ea32724d1..bb5e4b3fa95a8c 100644 --- a/Tools/msi/lib/lib.wixproj +++ b/Tools/msi/lib/lib.wixproj @@ -15,7 +15,7 @@ - + - \ No newline at end of file + From dc774cd63a2b1f78884fdf86efdcd75c83a1dce4 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Fri, 1 Nov 2024 12:23:41 +0800 Subject: [PATCH 6/8] Update lib.wixproj --- Tools/msi/lib/lib.wixproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/msi/lib/lib.wixproj b/Tools/msi/lib/lib.wixproj index bb5e4b3fa95a8c..02078e503d74a4 100644 --- a/Tools/msi/lib/lib.wixproj +++ b/Tools/msi/lib/lib.wixproj @@ -15,10 +15,11 @@ - + From d7da6b8919fbfea55cbe340934cff9e2a8976668 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:43:46 +0800 Subject: [PATCH 7/8] Update Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst Co-authored-by: Daniel Hollas --- .../next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst index 8ff3a116ff4afa..1b0b0b0bdc4807 100644 --- a/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst +++ b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst @@ -1 +1 @@ -Add turtle.py into Tcl/Tk installation option +Mention the turtle module in Tcl/Tk installation option in Windows installer. Exclude turtle.py from stdlib if this option is not set. From ddb386a1dafcda9624f8eada63d5ed627157de74 Mon Sep 17 00:00:00 2001 From: CoderTCY <73740771+CoderTCY@users.noreply.github.com> Date: Sun, 10 Nov 2024 09:25:19 +0800 Subject: [PATCH 8/8] Update Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> --- .../next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst index 1b0b0b0bdc4807..fbf4ab1cd1a11a 100644 --- a/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst +++ b/Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst @@ -1 +1 @@ -Mention the turtle module in Tcl/Tk installation option in Windows installer. Exclude turtle.py from stdlib if this option is not set. +Makes the presence of the :mod:`turtle` module dependent on the Tcl/Tk installer option. Previously, the module was always installed but would be unusable without Tcl/Tk.