Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit d768ddf

Browse files
author
Anselm Kruis
committed
Merge tag v3.7.8rc1 into 3.7-slp
2 parents 186b7ac + 5f3933d commit d768ddf

File tree

100 files changed

+1505
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1505
-678
lines changed

Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ clean:
127127

128128
venv:
129129
$(PYTHON) -m venv $(VENVDIR)
130-
$(VENVDIR)/bin/python3 -m pip install -U Sphinx==1.8.2 blurb
130+
$(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.3.1 blurb
131131
@echo "The venv has been created in the $(VENVDIR) directory"
132132

133133
dist:

Include/patchlevel.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
/*--start constants--*/
1919
#define PY_MAJOR_VERSION 3
2020
#define PY_MINOR_VERSION 7
21-
#define PY_MICRO_VERSION 7
22-
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
23-
#define PY_RELEASE_SERIAL 0
21+
#define PY_MICRO_VERSION 8
22+
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
23+
#define PY_RELEASE_SERIAL 1
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.7.7+"
26+
#define PY_VERSION "3.7.8rc1"
2727
/*--end constants--*/
2828

2929
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/pydoc_data/topics.py

Lines changed: 561 additions & 475 deletions
Large diffs are not rendered by default.

Mac/BuildScript/scripts/postflight.documentation

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ SHARE_DOCDIR_TO_FWK="../../.."
1212
# make link in /Applications/Python m.n/ for Finder users
1313
if [ -d "${APPDIR}" ]; then
1414
ln -fhs "${FWK_DOCDIR}/index.html" "${APPDIR}/Python Documentation.html"
15-
open "${APPDIR}" || true # open the applications folder
15+
if [ "${COMMAND_LINE_INSTALL}" != 1 ]; then
16+
open "${APPDIR}" || true # open the applications folder
17+
fi
1618
fi
1719

1820
# make share/doc link in framework for command line users

Mac/PythonLauncher/factorySettings.plist

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<false/>
1111
<key>interpreter_list</key>
1212
<array>
13-
<string>/usr/local/bin/pythonw</string>
14-
<string>/usr/bin/pythonw</string>
15-
<string>/sw/bin/pythonw</string>
13+
<string>/usr/local/bin/python3</string>
14+
<string>/opt/local/bin/python3</string>
15+
<string>/sw/bin/python3</string>
1616
</array>
1717
<key>honourhashbang</key>
1818
<false/>
@@ -35,12 +35,9 @@
3535
<false/>
3636
<key>interpreter_list</key>
3737
<array>
38-
<string>/usr/local/bin/pythonw</string>
39-
<string>/usr/local/bin/python</string>
40-
<string>/usr/bin/pythonw</string>
41-
<string>/usr/bin/python</string>
42-
<string>/sw/bin/pythonw</string>
43-
<string>/sw/bin/python</string>
38+
<string>/usr/local/bin/python3</string>
39+
<string>/opt/local/bin/python3</string>
40+
<string>/sw/bin/python3</string>
4441
</array>
4542
<key>honourhashbang</key>
4643
<false/>
@@ -63,12 +60,9 @@
6360
<false/>
6461
<key>interpreter_list</key>
6562
<array>
66-
<string>/usr/local/bin/pythonw</string>
67-
<string>/usr/local/bin/python</string>
68-
<string>/usr/bin/pythonw</string>
69-
<string>/usr/bin/python</string>
70-
<string>/sw/bin/pythonw</string>
71-
<string>/sw/bin/python</string>
63+
<string>/usr/local/bin/python3</string>
64+
<string>/opt/local/bin/python3</string>
65+
<string>/sw/bin/python3</string>
7266
</array>
7367
<key>honourhashbang</key>
7468
<false/>

Mac/Resources/app/Info.plist.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<key>CFBundleExecutable</key>
2121
<string>Python</string>
2222
<key>CFBundleGetInfoString</key>
23-
<string>%version%, (c) 2001-2016 Python Software Foundation.</string>
23+
<string>%version%, (c) 2001-2020 Python Software Foundation.</string>
2424
<key>CFBundleHelpBookFolder</key>
2525
<array>
2626
<string>Documentation</string>
@@ -55,7 +55,7 @@
5555
<key>NSAppleScriptEnabled</key>
5656
<true/>
5757
<key>NSHumanReadableCopyright</key>
58-
<string>(c) 2001-2016 Python Software Foundation.</string>
58+
<string>(c) 2001-2020 Python Software Foundation.</string>
5959
<key>NSHighResolutionCapable</key>
6060
<true/>
6161
</dict>

0 commit comments

Comments
 (0)