Skip to content

Commit 8a0a500

Browse files
ned-deilyned-deily
authored
Update macOS installer build for 2.7.18 end-of-life. (GH-19352)
1 parent ba8a2bc commit 8a0a500

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎Lib/test/test_posix.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,11 @@ def _create_and_do_getcwd(dirname, current_path_length = 0):
556556
)
557557
if quirky_platform:
558558
expected_errno = errno.ERANGE
559-
self.assertEqual(e.errno, expected_errno)
559+
if 'darwin' in sys.platform:
560+
# macOS 10.15 may return errno.ENOENT instead
561+
self.assertIn(e.errno, (errno.ENOENT, errno.ENAMETOOLONG))
562+
else:
563+
self.assertEqual(e.errno, expected_errno)
560564
finally:
561565
os.chdir('..')
562566
os.rmdir(dirname)

‎Mac/BuildScript/build-installer.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
For 10.6 or greater deployment targets, build-installer builds and links
2626
with its own copy of Tcl/Tk 8.6 and the rest of this paragraph does not
2727
apply. Otherwise, build-installer requires an installed third-party version
28-
of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
29-
(for 10.6 or later) installed in /Library/Frameworks. When installed,
30-
the Python built by this script will attempt to dynamically link first to
31-
Tcl and Tk frameworks in /Library/Frameworks if available otherwise fall
32-
back to the ones in /System/Library/Framework. For the build, we recommend
28+
of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) installed in
29+
/Library/Frameworks. For 10.4 or 10.5, the Python built by this script
30+
when installed will attempt to dynamically link first to Tcl and Tk frameworks
31+
in /Library/Frameworks if available otherwise fall back to the ones in
32+
/System/Library/Framework. For 10.4 or 10.5, we recommend
3333
installing the most recent ActiveTcl 8.5 or 8.4 version, depending
3434
on the deployment target. The actual version linked to depends on the
3535
path of /Library/Frameworks/{Tcl,Tk}.framework/Versions/Current.
@@ -213,9 +213,9 @@ def library_recipes():
213213

214214
result.extend([
215215
dict(
216-
name="OpenSSL 1.0.2t",
217-
url="https://www.openssl.org/source/openssl-1.0.2t.tar.gz",
218-
checksum='ef66581b80f06eae42f5268bc0b50c6d',
216+
name="OpenSSL 1.0.2u",
217+
url="https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz",
218+
checksum='cdc2638f789ecc2db2c91488265686c1',
219219
buildrecipe=build_universal_openssl,
220220
configure=None,
221221
install=None,
@@ -311,9 +311,9 @@ def library_recipes():
311311
),
312312
),
313313
dict(
314-
name="SQLite 3.28.0",
315-
url="https://www.sqlite.org/2019/sqlite-autoconf-3280000.tar.gz",
316-
checksum='3c68eb400f8354605736cd55400e1572',
314+
name="SQLite 3.31.1",
315+
url="https://sqlite.org/2020/sqlite-autoconf-3310100.tar.gz",
316+
checksum='2d0a553534c521504e3ac3ad3b90f125',
317317
extra_cflags=('-Os '
318318
'-DSQLITE_ENABLE_FTS5 '
319319
'-DSQLITE_ENABLE_FTS4 '

‎Mac/BuildScript/resources/ReadMe.rtf‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
2-
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
1+
{\rtf1\ansi\ansicpg1252\cocoartf2512
2+
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
33
\f3\fmodern\fcharset0 CourierNewPSMT;}
44
{\colortbl;\red255\green255\blue255;}
55
{\*\expandedcolortbl;;}
@@ -9,8 +9,8 @@
99
\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
1010
\
1111
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
12-
\cf0 NOTE:
13-
\f1\b \ul Python 2 reaches end-of-life in 2020 and will no longer be supported or updated thereafter\ulnone .
12+
13+
\f1\b \cf0 NOTE: \ul Python 2.7,x has now reached end-of-life. This release, Python 2.7.18, is the FINAL RELEASE of Python 2.7.x. It will no longer be supported or updated\ulnone .
1414
\f0\b0 You should
1515
\f1\b upgrade to Python 3
1616
\f0\b0 as soon as you can. {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/sunset-python-2/"}}{\fldrslt Read more here}}.\
@@ -44,18 +44,14 @@ The bundled
4444
\f0\b0 \ulnone \
4545
\
4646
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
47-
\cf0 In almost all cases, you should use the
47+
\cf0 Use the
4848
\f1\b macOS 64-bit installer for OS X 10.9 and later
49-
\f0\b0 .\
50-
\
51-
The legacy
49+
\f0\b0 . As of 2.7.18, the deprecated
5250
\f1\b macOS 64-bit/32-bit installer for Mac OS X 10.6 and later
53-
\f0\b0 variant is now deprecated. 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 through the support window of Python 2.7.
54-
\f1\b macOS 10.15 Catalina
55-
\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. \
51+
\f0\b0 variant is no longer provided. \
5652
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
5753

58-
\f1\b \cf0 \ul \
54+
\f1\b \cf0 \ul \ulc0 \
5955
Using IDLE or other Tk applications
6056
\f0\b0 \ulnone \
6157
\

‎Mac/BuildScript/resources/Welcome.rtf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
2-
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
1+
{\rtf1\ansi\ansicpg1252\cocoartf2512
2+
\cocoascreenfonts1\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
33
}
44
{\colortbl;\red255\green255\blue255;}
55
{\*\expandedcolortbl;;}
@@ -26,7 +26,7 @@ At the end of this install, click on
2626
\f0 to install a set of current SSL root certificates.\
2727
\
2828

29-
\f1\b NOTE: \ul Python 2 reaches end-of-life in 2020 and will no longer be supported or updated thereafter\ulnone .
29+
\f1\b NOTE: \ul Python 2.7,x has now reached end-of-life. This release, Python 2.7.18, is the FINAL RELEASE of Python 2.7.x. It will no longer be supported or updated\ulnone .
3030
\f0\b0 You should
3131
\f1\b upgrade to Python 3
3232
\f0\b0 as soon as you can. {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/sunset-python-2/"}}{\fldrslt Read more here}}.\

0 commit comments

Comments
 (0)