Skip to content

Commit c60bed3

Browse files
authored
[3.7] Update macOS installer display files for 3.7.5 (GH-16767)
1 parent 20d1f49 commit c60bed3

File tree

3 files changed

+80
-136
lines changed

3 files changed

+80
-136
lines changed

Mac/BuildScript/resources/License.rtf

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
2-
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPS-BoldMT;\f2\fmodern\fcharset0 CourierNewPSMT;
3-
}
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
2+
{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fmodern\fcharset0 CourierNewPS-BoldMT;
3+
\f3\fmodern\fcharset0 CourierNewPSMT;}
44
{\colortbl;\red255\green255\blue255;}
5+
{\*\expandedcolortbl;;}
56
\margl1440\margr1440\vieww14620\viewh13380\viewkind0
6-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
7+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
78

89
\f0\b\fs36 \cf0 \ul \ulc0 HISTORY AND LICENSE\
910
1011
\fs24 \
1112
HISTORY OF THE SOFTWARE\
1213
13-
\b0 \ulnone \
14+
\f1\b0 \ulnone \
1415
Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others.\
1516
\
1617
In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\
@@ -20,10 +21,10 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to f
2021
All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\
2122
\
2223

23-
\f1\b Release Derived Year Owner GPL-\
24+
\f2\b Release Derived Year Owner GPL-\
2425
from compatible?\
2526
26-
\f2\b0 \
27+
\f3\b0 \
2728
0.9.0 thru 1.2 n/a 1991-1995 CWI yes\
2829
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\
2930
1.6 1.5.2 2000 CNRI no\
@@ -36,25 +37,25 @@ All Python releases are Open Source (see http://www.opensource.org for the Open
3637
2.1.3 2.1.2 2002 PSF yes\
3738
2.2 and above 2.1.1 2001-now PSF yes\
3839

39-
\f0 \
40+
\f1 \
4041

41-
\b Note:
42-
\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
42+
\f0\b Note:
43+
\f1\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
4344
\
4445
Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\
4546
\
4647
\
4748

48-
\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
49+
\f0\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
4950
50-
\b0 \ulnone \
51+
\f1\b0 \ulnone \
5152

52-
\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
53+
\f0\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
5354
54-
\b0 \
55+
\f1\b0 \
5556
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.\
5657
\
57-
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
58+
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
5859
\
5960
3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.\
6061
\
@@ -70,9 +71,9 @@ Thanks to the many outside volunteers who have worked under Guido's direction to
7071
\
7172
\
7273

73-
\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
74+
\f0\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
7475
75-
\b0 \
76+
\f1\b0 \
7677
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
7778
\
7879
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software").\
@@ -91,9 +92,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
9192
\
9293
\
9394

94-
\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
95+
\f0\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
9596
96-
\b0 \
97+
\f1\b0 \
9798
1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\
9899
\
99100
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
@@ -114,9 +115,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
114115
\
115116
\
116117

117-
\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
118+
\f0\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
118119
119-
\b0 \
120+
\f1\b0 \
120121
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved.\
121122
\
122123
Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.\
@@ -125,16 +126,16 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT
125126
\
126127
\
127128

128-
\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
129+
\f0\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
129130
130-
\b0 \ulnone \
131+
\f1\b0 \ulnone \
131132
This installer incorporates portions of the following third-party software:\
132133
\
133134

134-
\f2 $THIRD_PARTY_LIBS\
135+
\f3 $THIRD_PARTY_LIBS\
135136
\
136137

137-
\f0 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
138+
\f1 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
138139
\
139140
\
140141
\

Mac/BuildScript/resources/ReadMe.rtf

Lines changed: 48 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -7,127 +7,80 @@
77
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
88

99
\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
10-
\
11-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
12-
13-
\f1\b \cf0 \ul \ulc0 macOS 10.15 Catalina Support\
14-
\
1510
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
16-
17-
\f0\b0 \cf0 \ulnone At the time of the release of this release candidate, the next release of macOS,
18-
\f1\b 10.15 Catalina
19-
\f0\b0 , was still in public beta. Any updates needed to support 10.15 will be provided after it releases.\
20-
\
11+
\cf0 \
2112
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
2213

23-
\f1\b \cf0 \ul \ulc0 Which installer variant should I use?
24-
\f0\b0 \ulnone \
25-
\
26-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
27-
28-
\f1\b \cf0 CHANGED in 3.7.4:
29-
\f0\b0 The
30-
\f1\b 10.6+ 64-/32-bit installer variant is being deprecated
31-
\f0\b0 .
32-
\f1\b Python 3.8.0
33-
\f0\b0 will
34-
\f1\b not
35-
\f0\b0 include a binary installer for 10.6+ and
36-
\f1\b future bugfix releases of 3.7.x
37-
\f0\b0 may not, either. Mac OS X 10.6 Snow Leopard was released in 2009 and has not been supported by Apple for many years including lack of security updates. It is becoming increasingly difficult to ensure new Python features and bug fixes are compatible with such old systems especially with Apple's deprecation and removal of 32-bit support in recent and upcoming macOS releases. We believe that there is now very little usage of this installer variant and so we would like to focus our resources on supporting newer systems. We do not plan to intentionally break Python support on 10.6 and we will consider bug fixes for problems found when building from source on 10.6. \
38-
\
39-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
40-
\cf0 For Python.3.7, python.org currently provides two installer variants for download: one that installs a
41-
\f2\i 64-bit-only
42-
\f0\i0 Python capable of running on
43-
\f2\i macOS 10.9 (Mavericks)
44-
\f0\i0 or later; and one that installs a
45-
\f2\i 64-bit/32-bit Intel
46-
\f0\i0 Python capable of running on
47-
\f2\i macOS 10.6 (Snow Leopard)
48-
\f0\i0 or later. (This ReadMe was installed with the
49-
\f2\i $MACOSX_DEPLOYMENT_TARGET
50-
\f0\i0 variant.) If you are running on macOS 10.9 or later and if you have no need for compatibility with older systems, use the 10.9 variant. Use the 10.6 variant if you are running on macOS 10.6 through 10.8 or if you want to produce standalone applications that can run on systems from 10.6. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in macOS itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file.
51-
\f1\b \ul \
52-
\
53-
Certificate verification and OpenSSL\
14+
\f1\b \cf0 \ul Certificate verification and OpenSSL\
5415
5516
\f0\b0 \ulnone \
56-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
57-
\cf0 This variant of Python 3.7 includes its own private copy of OpenSSL 1.1.1. The deprecated Apple-supplied OpenSSL libraries are no longer used. This means that the trust certificates in system and user keychains managed by the
17+
This package includes its own private copy of OpenSSL 1.1.1. The trust certificates in system and user keychains managed by the
5818
\f2\i Keychain Access
5919
\f0\i0 application and the
6020
\f2\i security
61-
\f0\i0 command line utility are no longer used as defaults by the Python
21+
\f0\i0 command line utility are not used as defaults by the Python
6222
\f3 ssl
6323
\f0 module. A sample command script is included in
6424
\f3 /Applications/Python 3.7
6525
\f0 to install a curated bundle of default root certificates from the third-party
6626
\f3 certifi
67-
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). If you choose to use
68-
\f3 certifi
69-
\f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt project's email update service}} to be notified when the certificate bundle is updated.\
70-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
71-
\cf0 \
27+
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). Double-click on
28+
\f3 Install Certificates
29+
\f0 to run it.\
30+
\
7231
The bundled
7332
\f3 pip
74-
\f0 included with this installer has its own default certificate store for verifying download connections.\
75-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
33+
\f0 has its own default certificate store for verifying download connections.\
34+
\
7635

77-
\f1\b \cf0 \
78-
CHANGED in 3.7.4:
79-
\f0\b0 OpenSSL has been updated from 1.1.0 to 1.1.1.\
36+
\f1\b \ul Which installer variant should I use?
37+
\f0\b0 \ulnone \
38+
\
39+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
40+
\cf0 In almost all cases, you should use the
41+
\f1\b macOS 64-bit installer for OS X 10.9 and later
42+
\f0\b0 .\
43+
\
44+
The legacy
45+
\f1\b macOS 64-bit/32-bit installer for Mac OS X 10.6 and later
46+
\f0\b0 variant is now deprecated.
47+
\f1\b Python 3.8.0
48+
\f0\b0 will
49+
\f1\b not
50+
\f0\b0 include a binary installer for the 10.6+ variant and
51+
\f1\b future bugfix releases of 3.7.x
52+
\f0\b0 may not, either. macOS 10.6 Snow Leopard was released in 2009 and has not been supported by Apple for many years including lack of security updates. It is becoming increasingly difficult to ensure new Python features and bug fixes are compatible with such old systems. Note that, due to recent Apple installer packaging changes, the 10.6+ installer pkg we provide can no longer be opened by the Apple system installer application on 10.6; 10.7 and 10.8 are not affected. We believe that there is now very little usage of this installer variant and so we would like to focus our resources on supporting newer systems. We do not plan to intentionally break Python support on 10.6 through 10.8 and we will consider bug fixes for problems found when building from source on those systems.
53+
\f1\b macOS 10.15 Catalina
54+
\f0\b0 removes support for running 32-bit architecture programs; we do not recommend trying to use the 10.6+ variant on it and it may not install on 10.15 systems without intervention. \
8055
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
81-
\cf0 \
8256

83-
\f1\b \ul Using IDLE or other Tk applications
57+
\f1\b \cf0 \ul \
58+
Using IDLE or other Tk applications
8459
\f0\b0 \ulnone \
8560
\
86-
Both installer variants now come with their own private version of Tcl/Tk 8.6. They no longer use system-supplied or third-party supplied versions of Tcl/Tk as in previous releases.\
61+
This package includes its own private version of Tcl/Tk 8.6. It does not use any system-supplied or third-party supplied versions of Tcl/Tk.\
62+
\
63+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
64+
\cf0 Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS may open a window with a message
65+
\f1\b "Python" would like to access files in your Documents folder
66+
\f0\b0 . This is normal as IDLE uses your
67+
\f1\b Documents
68+
\f0\b0 folder as its default when opening and saving files; you can still choose other locations in the
69+
\f1\b Open
70+
\f0\b0 and
71+
\f1\b Save
72+
\f0\b0 file dialog windows. Click on the
73+
\f1\b OK
74+
\f0\b0 button to proceed.\
75+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
8776

88-
\f1\b \ul \
77+
\f1\b \cf0 \ul \ulc0 \
8978
Other changes\
9079
\
91-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
92-
\cf0 \ulnone CHANGED in 3.7.4:
93-
\f0\b0 SQLite has been updated from 3.22.0 to 3.28.0
94-
\f1\b \ul \
95-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
9680
97-
\f0\b0 \cf0 \ulnone \
98-
For other changes in this release, see the
81+
\f0\b0 \ulnone For other changes in this release, see the
9982
\f2\i What's new
10083
\f0\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its
10184
\f2\i Release Notes
10285
\f0\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
103-
104-
\f1\b \ul \
105-
Python 3 and Python 2 Co-existence\
106-
107-
\f0\b0 \ulnone \
108-
Python.org Python $VERSION and 2.7.x versions can both be installed on your system and will not conflict. Command names for Python 3 contain a 3 in them,
109-
\f3 python3
110-
\f0 (or
111-
\f3 python$VERSION
112-
\f0 ),
113-
\f3 idle3
114-
\f0 (or i
115-
\f3 dle$VERSION
116-
\f0 ),
117-
\f3 pip3
118-
\f0 (or
119-
\f3 pip$VERSION
120-
\f0 ), etc. Python 2.7 command names contain a 2 or no digit:
121-
\f3 python2
122-
\f0 (or
123-
\f3 python2.7
124-
\f0 or
125-
\f3 python
126-
\f0 ),
127-
\f3 idle2
128-
\f0 (or
129-
\f3 idle2.7
130-
\f0 or
131-
\f3 idle
132-
\f0 ), etc.\
13386
}

0 commit comments

Comments
 (0)