Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
202 changes: 0 additions & 202 deletions Mac/BuildScript/bpo-44828-filedialog-crash-monterey.patch

This file was deleted.

12 changes: 8 additions & 4 deletions Mac/BuildScript/build-installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ def library_recipes():
tk_patches = ['tk868_on_10_8_10_9.patch']

else:
tcl_tk_ver='8.6.11'
tcl_checksum='8a4c004f48984a03a7747e9ba06e4da4'
tcl_tk_ver='8.6.12rc1'
tcl_checksum='82fd1637c0f7d4b76cb909f8abc373ec'

tk_checksum='c7ee71a2d05bba78dfffd76528dc17c6'
tk_patches = ['bpo-44828-filedialog-crash-monterey.patch']
tk_checksum='d63c3b91b86cd8b6fa54e83ef2c5153e'
tk_patches = [ ]


result.extend([
Expand Down Expand Up @@ -729,6 +729,10 @@ def extractArchive(builddir, archiveName):
if ((retval.startswith('tcl') or retval.startswith('tk'))
and retval.endswith('-src')):
retval = retval[:-4]
# Strip rcxx suffix from Tcl/Tk release candidates
retval_rc = retval.find('rc')
if retval_rc > 0:
retval = retval[:retval_rc]
if os.path.exists(retval):
shutil.rmtree(retval)
fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')
Expand Down
12 changes: 2 additions & 10 deletions Mac/BuildScript/resources/ReadMe.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0

\f1\b \cf0 NOTE:
\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\
\f0\b0 This is an alpha preview of Python 3.11.0, the next feature release of Python 3. It is not intended for production use.\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
Expand Down Expand Up @@ -66,17 +66,9 @@ Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS ma
\f0\b0 button to proceed.\
\

\f1\b \ul macOS 11 (Big Sur) and Apple Silicon Mac support\
\f1\b \ul Apple Silicon Mac support\

\f0\b0 \ulnone \
For Python 3.10 releases, we provide a new
\f4 universal2
\f0 installer variant that provides universal binaries for both
\f4 ARM64
\f0 and
\f4 Intel 64
\f0 architectures and is also supported on all Macs that support macOS 10.9 or later. Some of the advantages of the new installer variant: native ARM64 code on Apple Silicon Macs should run significantly faster than Rosetta2-emulated code; some operating system functions and options introduced in macOS releases since 10.9 are now exposed when available (primarily in the os module); and the new installer variant includes Tcl/Tk 8.6.11 rather than 8.6.8.\
\
On Apple Silicon Macs, it is possible to run Python either with native ARM64 code or under Intel 64 emulation using Rosetta2. This option might be useful for testing or if binary wheels are not yet available with native ARM64 binaries. To easily force Python to run in emulation mode, invoke it from a command line shell with the
\f4 python3-intel64
\f0 command instead of just
Expand Down
4 changes: 2 additions & 2 deletions Mac/BuildScript/resources/Welcome.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
\paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
\paperw11900\paperh16840\margl1440\margr1440\vieww12200\viewh10880\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0

\f0\fs24 \cf0 This package will install
Expand All @@ -26,5 +26,5 @@ At the end of this install, click on
\

\f1\b NOTE:
\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\
\f0\b0 This is an alpha test preview of Python 3.11.0, the next feature release of Python 3. It is not intended for production use.\
}