Skip to content

Commit fdc3a3d

Browse files
Merge branch 'master' into fix-issue8525
* master: (1159 commits) bpo-34087: Fix buffer overflow in int(s) and similar functions (pythonGH-8274) bpo-34108: Fix double carriage return in 2to3 on Windows (python#8271) bpo-4260: Document that ctypes.xFUNCTYPE are decorators (pythonGH-7924) bpo-33723: Fix test_time.test_thread_time() (pythonGH-8267) bpo-33967: Remove use of deprecated assertRaisesRegexp() (pythonGH-8261) bpo-34080: Fix a memory leak in the compiler. (pythonGH-8222) Enable GUI testing on Travis Linux builds via Xvfb (pythonGH-7887) bpo-23927: Make getargs.c skipitem() skipping 'w*'. (pythonGH-8192) bpo-33648: Remove PY_WARN_ON_C_LOCALE (pythonGH-7114) bpo-34092, test_logging: increase SMTPHandlerTest timeout (pythonGH-8245) Simplify __all__ in multiprocessing (pythonGH-6856) bpo-34083: Update dict order in Functional HOWTO (pythonGH-8230) Doc: Point to Simple statements section instead of PEP (pythonGH-8238) bpo-29442: Replace optparse with argparse in setup.py (pythonGH-139) bpo-33597: Add What's New for PyGC_Head (pythonGH-8236) Dataclasses: Fix example on 30.6.8, add method should receive a list rather than an integer. (pythonGH-8038) Fix documentation for input and output tutorial (pythonGH-8231) bpo-34009: Expand on platform support changes (pythonGH-8022) Factor-out two substantially identical code blocks. (pythonGH-8219) bpo-34031: fix incorrect usage of self.fail in two tests (pythonGH-8091) ...
2 parents defa5a9 + 16dfca4 commit fdc3a3d

File tree

1,635 files changed

+124839
-59747
lines changed

Some content is hidden

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

1,635 files changed

+124839
-59747
lines changed

.gitattributes

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Lib/test/decimaltestdata/*.decTest -text
2626
Lib/test/test_email/data/*.txt -text
2727
Lib/test/xmltestdata/* -text
2828
Lib/test/coding20731.py -text
29+
Lib/test/test_importlib/data01/* -text
2930

3031
# CRLF files
3132
*.bat text eol=crlf
@@ -36,3 +37,20 @@ Lib/test/coding20731.py -text
3637
*.proj text eol=crlf
3738
PCbuild/readme.txt text eol=crlf
3839
PC/readme.txt text eol=crlf
40+
41+
# Generated files
42+
# https://github.com/github/linguist#generated-code
43+
Include/graminit.h linguist-generated=true
44+
Python/graminit.h linguist-generated=true
45+
Modules/clinic/*.h linguist-generated=true
46+
Objects/clinic/*.h linguist-generated=true
47+
PC/clinic/*.h linguist-generated=true
48+
Python/clinic/*.h linguist-generated=true
49+
Python/importlib.h linguist-generated=true
50+
Python/importlib_external.h linguist-generated=true
51+
Include/Python-ast.h linguist-generated=true
52+
Python/Python-ast.c linguist-generated=true
53+
Include/opcode.h linguist-generated=true
54+
Python/opcode_targets.h linguist-generated=true
55+
Objects/typeslots.inc linguist-generated=true
56+
Modules/unicodedata_db.h linguist-generated=true

.github/CODEOWNERS

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@
88
**/*asyncio* @1st1 @asvetlov
99

1010
# Core
11+
**/*context* @1st1
1112
**/*genobject* @1st1
13+
**/*hamt* @1st1
1214

1315
# Hashing
1416
**/*hashlib* @python/crypto-team
1517
**/*pyhash* @python/crypto-team
1618

17-
# Import (including importlib)
18-
**/*import* @python/import-team
19+
# Import (including importlib).
20+
# Ignoring importlib.h so as to not get flagged on
21+
# all pull requests that change the the emitted
22+
# bytecode.
23+
**/*import*.c @python/import-team
24+
**/*import*.py @python/import-team
25+
1926

2027
# SSL
2128
**/*ssl* @python/crypto-team

.github/CONTRIBUTING.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Build Status
88

99
+ `Stable buildbots <http://buildbot.python.org/3.x.stable/>`_
1010

11+
- 3.7
12+
13+
+ `Stable buildbots <http://buildbot.python.org/3.7.stable/>`_
14+
1115
- 3.6
1216

1317
+ `Stable buildbots <http://buildbot.python.org/3.6.stable/>`_

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
1-
!!! If this is a backport PR (PR made against branches other than `master`),
1+
<!--
2+
Thanks for your contribution!
3+
Please read this comment in its entirety. It's quite important.
4+
5+
# Pull Request title
6+
7+
It should be in the following format:
8+
9+
```
10+
bpo-NNNN: Summary of the changes made
11+
```
12+
13+
Where: bpo-NNNN refers to the issue number in the https://bugs.python.org.
14+
15+
Most PRs will require an issue number. Trivial changes, like fixing a typo, do not need an issue.
16+
17+
# Backport Pull Request title
18+
19+
If this is a backport PR (PR made against branches other than `master`),
220
please ensure that the PR title is in the following format:
21+
322
```
423
[X.Y] <title from the original PR> (GH-NNNN)
524
```
25+
626
Where: [X.Y] is the branch name, e.g. [3.6].
727
828
GH-NNNN refers to the PR number from `master`.
929
10-
PLEASE: Remove this headline!!!
30+
-->

.github/appveyor.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
version: 3.7.0a0.{build}
1+
version: 3.8build{build}
22
clone_depth: 5
33
branches:
44
only:
55
- master
66
- /\d\.\d/
77
- buildbot-custom
88
cache:
9-
- externals -> PCbuild\*
9+
- externals -> PCbuild
10+
before_build:
11+
- ps: |+
12+
if ($env:APPVEYOR_RE_BUILD) {
13+
echo 'Doing full build due to re-build request.'
14+
} elseif (!$env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
15+
echo 'Not a PR, doing full build.'
16+
} else {
17+
git fetch -q origin +refs/heads/$env:APPVEYOR_REPO_BRANCH
18+
$mergebase = git merge-base HEAD FETCH_HEAD
19+
$changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)'
20+
If (!$changes) {
21+
echo 'Only docs were updated, stopping build process.'
22+
Exit-AppveyorBuild
23+
} else {
24+
echo 'Doing full build due to non-doc changes in these files:'
25+
echo $changes
26+
}
27+
}
28+
29+
1030
build_script:
11-
- cmd: PCbuild\build.bat -e
12-
- cmd: PCbuild\win32\python.exe -m test.pythoninfo
31+
- cmd: PCbuild\build.bat -e
32+
- cmd: PCbuild\win32\python.exe -m test.pythoninfo
1333
test_script:
14-
- cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 --fail-env-changed -j0
34+
- cmd: PCbuild\rt.bat -q -uall -u-cpu -u-largefile -rwW --slowest --timeout=1200 --fail-env-changed -j0
1535
environment:
1636
HOST_PYTHON: C:\Python36\python.exe
1737
image:
18-
- Visual Studio 2017
19-
20-
# Only trigger AppVeyor if actual code or its configuration changes
21-
only_commits:
22-
files:
23-
- .github/appveyor.yml
24-
- .gitattributes
25-
- Grammar/
26-
- Include/
27-
- Lib/
28-
- Modules/
29-
- Objects/
30-
- PC/
31-
- PCbuild/
32-
- Parser/
33-
- Programs/
34-
- Python/
35-
- Tools/
38+
- Visual Studio 2017

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,5 @@ Tools/ssl/amd64
113113
Tools/ssl/win32
114114
.vs/
115115
.vscode/
116+
gmon.out
117+
.mypy_cache/

.hgeol

Lines changed: 0 additions & 58 deletions
This file was deleted.

.hgignore

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)