Skip to content

gh-125729: Makes the presence of the :mod:turtle module dependent on the Tcl/Tk installer option. #126176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 19, 2024
Merged

gh-125729: Makes the presence of the :mod:turtle module dependent on the Tcl/Tk installer option. #126176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dc292aa
Update tcltk.wixproj
CoderTCY Oct 30, 2024
39fd123
Update Default.wxl
CoderTCY Oct 30, 2024
cd54796
Update Tools/msi/bundle/Default.wxl
CoderTCY Oct 30, 2024
949aadc
Merge branch 'main' into patch-1
CoderTCY Oct 30, 2024
d681748
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 31, 2024
5934346
Update lib.wixproj
CoderTCY Oct 31, 2024
a461f3d
Merge branch 'main' into patch-1
CoderTCY Oct 31, 2024
dc774cd
Update lib.wixproj
CoderTCY Nov 1, 2024
d7da6b8
Update Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.K…
CoderTCY Nov 6, 2024
ddb386a
Update Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.K…
CoderTCY Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2024-10-31-09-46-53.gh-issue-125729.KdKVLa.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
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.
4 changes: 2 additions & 2 deletions Tools/msi/bundle/Default.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ Select Customize to review current options.</String>
<String Id="Include_docHelpLabel">Installs the Python documentation files.</String>
<String Id="Include_pipLabel">&amp;pip</String>
<String Id="Include_pipHelpLabel">Installs pip, which can download and install other Python packages.</String>
<String Id="Include_tcltkLabel">tcl/tk and &amp;IDLE</String>
<String Id="Include_tcltkHelpLabel">Installs tkinter and the IDLE development environment.</String>
<String Id="Include_tcltkLabel">Tcl/Tk, turtle and &amp;IDLE</String>
<String Id="Include_tcltkHelpLabel">Installs tkinter, turtle and the IDLE development environment.</String>
<String Id="Include_testLabel">Python &amp;test suite</String>
<String Id="Include_testHelpLabel">Installs the standard library test suite.</String>
<String Id="Include_launcherLabel">py &amp;launcher</String>
Expand Down
3 changes: 2 additions & 1 deletion Tools/msi/lib/lib.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<InstallFiles Include="$(PySourcePath)Lib\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;
$(PySourcePath)Lib\**\*.pyo;
$(PySourcePath)Lib\turtle.py;
$(PySourcePath)Lib\site-packages\README;
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
Expand All @@ -32,4 +33,4 @@
</ItemGroup>

<Import Project="..\msi.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions Tools/msi/tcltk/tcltk.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Group>tcltk_lib</Group>
</InstallFiles>

<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*"
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*;$(PySourcePath)Lib\turtle.py"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
Expand All @@ -39,4 +39,4 @@
</ItemGroup>

<Import Project="..\msi.targets" />
</Project>
</Project>
Loading