From 2c2ba05a6be0b7fafa0e2a833a65876e41d4733d Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sun, 3 Feb 2019 00:41:20 -0500 Subject: [PATCH] Update macOS installer Welcome and ReadMe for 3.8 (GH-11748) --- Mac/BuildScript/resources/ReadMe.rtf | 91 +++++++++++---------------- Mac/BuildScript/resources/Welcome.rtf | 24 +++---- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index 6677a6ae0ad..ab7aeff5376 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -1,5 +1,6 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;} +{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique; +\f3\fmodern\fcharset0 CourierNewPSMT;} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} \margl1440\margr1440\vieww13380\viewh14600\viewkind0 @@ -9,86 +10,70 @@ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\b \cf0 \ul \ulc0 Which installer variant should I use? -\b0 \ulnone \ -\ -For Python.3.7, python.org currently provides two installer variants for download: one that installs a -\i 64-bit-only -\i0 Python capable of running on -\i macOS 10.9 (Mavericks) -\i0 or later; and one that installs a -\i 64-bit/32-bit Intel -\i0 Python capable of running on -\i macOS 10.6 (Snow Leopard) -\i0 or later. (This ReadMe was installed with the -\i $MACOSX_DEPLOYMENT_TARGET -\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. -\b \ul \ -\ -Certificate verification and OpenSSL\ +\f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\ -\b0 \ulnone \ -This variant of Python 3.7 includes its own private copy of OpenSSL 1.1.0. The deprecated Apple-supplied OpenSSL libraries are no longer used. This means that the trust certificates in system and user keychains managed by the -\i Keychain Access -\i0 application and the -\i security -\i0 command line utility are no longer used as defaults by the Python -\f1 ssl +\f0\b0 \ulnone \ +This package includes its own private copy of OpenSSL 1.1.0. The trust certificates in system and user keychains managed by the +\f2\i Keychain Access +\f0\i0 application and the +\f2\i security +\f0\i0 command line utility are not used as defaults by the Python +\f3 ssl \f0 module. A sample command script is included in -\f1 /Applications/Python 3.7 +\f3 /Applications/Python 3.8 \f0 to install a curated bundle of default root certificates from the third-party -\f1 certifi +\f3 certifi \f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). If you choose to use -\f1 certifi +\f3 certifi \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.\ \ The bundled -\f1 pip +\f3 pip \f0 included with this installer has its own default certificate store for verifying download connections.\ \ -\b \ul Using IDLE or other Tk applications -\b0 \ulnone \ +\f1\b \ul Using IDLE or other Tk applications +\f0\b0 \ulnone \ \ -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.\ +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.\ -\b \ul \ +\f1\b \ul \ Other changes\ -\b0 \ulnone \ +\f0\b0 \ulnone \ For other changes in this release, see the -\i What's new -\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its -\i Release Notes -\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\ +\f2\i What's new +\f0\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its +\f2\i Release Notes +\f0\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\ -\b \ul \ +\f1\b \ul \ Python 3 and Python 2 Co-existence\ -\b0 \ulnone \ +\f0\b0 \ulnone \ 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, -\f1 python3 +\f3 python3 \f0 (or -\f1 python$VERSION +\f3 python$VERSION \f0 ), -\f1 idle3 +\f3 idle3 \f0 (or i -\f1 dle$VERSION +\f3 dle$VERSION \f0 ), -\f1 pip3 +\f3 pip3 \f0 (or -\f1 pip$VERSION +\f3 pip$VERSION \f0 ), etc. Python 2.7 command names contain a 2 or no digit: -\f1 python2 +\f3 python2 \f0 (or -\f1 python2.7 +\f3 python2.7 \f0 or -\f1 python +\f3 python \f0 ), -\f1 idle2 +\f3 idle2 \f0 (or -\f1 idle2.7 +\f3 idle2.7 \f0 or -\f1 idle +\f3 idle \f0 ), etc.\ } \ No newline at end of file diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf index 8e1847ef735..df5d20da9eb 100644 --- a/Mac/BuildScript/resources/Welcome.rtf +++ b/Mac/BuildScript/resources/Welcome.rtf @@ -1,23 +1,23 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200 +\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} \paperw11905\paperh16837\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 -\b Python $FULL_VERSION -\b0 for -\b macOS $MACOSX_DEPLOYMENT_TARGET -\b0 .\ +\f1\b Python $FULL_VERSION +\f0\b0 for +\f1\b macOS $MACOSX_DEPLOYMENT_TARGET +\f0\b0 .\ \ -\b Python for macOS -\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment -\b IDLE -\b0 .\ +\f1\b Python for macOS +\f0\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment +\f1\b IDLE +\f0\b0 .\ \ -\b NEW in 3.7.0: -\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support (no additional third-party downloads!), OpenSSL 1.1.0, and more!\ +\f1\b NOTE: +\f0\b0 This is an alpha test preview of Python 3.8.0, the next feature release of Python 3.8. It is not intended for production use.\ } \ No newline at end of file