Skip to content

Commit 11c1706

Browse files
Merge branch 'master' into bitwise_docs
* master: (2633 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 a3d60fe + 16dfca4 commit 11c1706

File tree

2,262 files changed

+236700
-128360
lines changed

Some content is hidden

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

2,262 files changed

+236700
-128360
lines changed

.bzrignore

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

.gitattributes

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,56 @@
1+
# Binary data types
2+
*.aif binary
3+
*.aifc binary
4+
*.aiff binary
5+
*.au binary
6+
*.bmp binary
7+
*.exe binary
8+
*.icns binary
9+
*.gif binary
10+
*.ico binary
11+
*.jpg binary
112
*.pck binary
2-
Lib/test/cjkencodings/* binary
3-
Lib/test/decimaltestdata/*.decTest binary
13+
*.png binary
14+
*.psd binary
15+
*.tar binary
16+
*.wav binary
17+
*.whl binary
18+
*.zip binary
19+
20+
# Specific binary files
421
Lib/test/sndhdrdata/sndhdr.* binary
5-
Lib/test/test_email/data/msg_26.txt binary
6-
Lib/test/xmltestdata/* binary
7-
Lib/venv/scripts/nt/* binary
8-
Lib/test/coding20731.py binary
22+
23+
# Text files that should not be subject to eol conversion
24+
Lib/test/cjkencodings/* -text
25+
Lib/test/decimaltestdata/*.decTest -text
26+
Lib/test/test_email/data/*.txt -text
27+
Lib/test/xmltestdata/* -text
28+
Lib/test/coding20731.py -text
29+
Lib/test/test_importlib/data01/* -text
30+
31+
# CRLF files
32+
*.bat text eol=crlf
33+
*.ps1 text eol=crlf
34+
*.sln text eol=crlf
35+
*.vcxproj* text eol=crlf
36+
*.props text eol=crlf
37+
*.proj text eol=crlf
38+
PCbuild/readme.txt text eol=crlf
39+
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: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# See https://help.github.com/articles/about-codeowners/
2+
# for more info about CODEOWNERS file
3+
4+
# It uses the same pattern rule for gitignore file
5+
# https://git-scm.com/docs/gitignore#_pattern_format
6+
7+
# asyncio
8+
**/*asyncio* @1st1 @asvetlov
9+
10+
# Core
11+
**/*context* @1st1
12+
**/*genobject* @1st1
13+
**/*hamt* @1st1
14+
15+
# Hashing
16+
**/*hashlib* @python/crypto-team
17+
**/*pyhash* @python/crypto-team
18+
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+
26+
27+
# SSL
28+
**/*ssl* @python/crypto-team
29+
30+
# CSPRNG
31+
Python/bootstrap_hash.c @python/crypto-team
32+
33+
# Email and related
34+
**/*mail* @python/email-team
35+
**/*smtp* @python/email-team
36+
**/*mime* @python/email-team
37+
**/*imap* @python/email-team
38+
**/*poplib* @python/email-team
39+
40+
# subprocess
41+
**/*subprocess* @gpshead
42+
43+
# Windows
44+
/PC/ @python/windows-team
45+
/PCbuild/ @python/windows-team
46+
47+
# Windows installer packages
48+
/Tools/msi/ @python/windows-team
49+
/Tools/nuget/ @python/windows-team
50+
51+
**/*itertools* @rhettinger
52+
**/*collections* @rhettinger
53+
**/*random* @rhettinger
54+
**/*queue* @rhettinger
55+
**/*bisect* @rhettinger
56+
**/*heapq* @rhettinger
57+
**/*functools* @ncoghlan @rhettinger
58+
**/*decimal* @rhettinger @skrah
59+
60+
**/*dataclasses* @ericvsmith
61+
62+
**/*idlelib* @terryjreedy
63+
64+
**/*typing* @gvanrossum @ilevkivskyi

.github/CONTRIBUTING.rst

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,55 @@ Build Status
88

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

11-
- 3.6
11+
- 3.7
1212

13-
+ `Stable buildbots <http://buildbot.python.org/3.6.stable/>`_
13+
+ `Stable buildbots <http://buildbot.python.org/3.7.stable/>`_
1414

15-
- 3.5
15+
- 3.6
1616

17-
+ `Stable buildbots <http://buildbot.python.org/3.5.stable/>`_
17+
+ `Stable buildbots <http://buildbot.python.org/3.6.stable/>`_
1818

1919
- 2.7
2020

2121
+ `Stable buildbots <http://buildbot.python.org/2.7.stable/>`_
2222

2323

24+
Thank You
25+
---------
26+
First off, thanks for contributing to the maintenance of the Python programming
27+
language and the CPython interpreter! Even if your contribution is not
28+
ultimately accepted, the fact you put time and effort into helping out is
29+
greatly appreciated.
30+
31+
2432
Contribution Guidelines
2533
-----------------------
26-
Please read the `devguide <https://cpython-devguide.readthedocs.io/>`_ for
34+
Please read the `devguide <https://devguide.python.org/>`_ for
2735
guidance on how to contribute to this project. The documentation covers
2836
everything from how to build the code to submitting a pull request. There are
2937
also suggestions on how you can most effectively help the project.
3038

3139
Please be aware that our workflow does deviate slightly from the typical GitHub
3240
project. Details on how to properly submit a pull request are covered in
33-
`Lifecycle of a Pull Request <https://cpython-devguide.readthedocs.io/pullrequest.html>`_.
34-
One key point is to keep comments on GitHub to only those related to the reviewing
35-
the code in the pull request. All other discussions -- e.g. about the issue being
36-
fixed -- should happen on bugs.python.org.
41+
`Lifecycle of a Pull Request <https://devguide.python.org/pullrequest/>`_.
42+
We utilize various bots and status checks to help with this, so do follow the
43+
comments they leave and their "Details" links, respectively. The key points of
44+
our workflow that are not covered by a bot or status check are:
45+
46+
- All discussions that are not directly related to the code in the pull request
47+
should happen on bugs.python.org
48+
- Upon your first non-trivial pull request (which includes documentation changes),
49+
feel free to add yourself to ``Misc/ACKS``
50+
3751

38-
If you are making a code contribution or large documentation contribution,
39-
please feel free to add yourself to the ``Misc/ACKS`` file alphabetically.
52+
Setting Expectations
53+
--------------------
54+
Due to the fact that this project is entirely volunteer-run (i.e. no one is paid
55+
to work on Python full-time), we unfortunately can make no guarantees as to if
56+
or when a core developer will get around to reviewing your pull request.
57+
If no core developer has done a review or responded to changes made because of a
58+
"changes requested" review, please feel free to email python-dev to ask if
59+
someone could take a look at your pull request.
4060

4161

4262
Code of Conduct

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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`),
20+
please ensure that the PR title is in the following format:
21+
22+
```
23+
[X.Y] <title from the original PR> (GH-NNNN)
24+
```
25+
26+
Where: [X.Y] is the branch name, e.g. [3.6].
27+
28+
GH-NNNN refers to the PR number from `master`.
29+
30+
-->

.github/appveyor.yml

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,38 @@
1-
version: 3.7.0a0.{build}
1+
version: 3.8build{build}
22
clone_depth: 5
3+
branches:
4+
only:
5+
- master
6+
- /\d\.\d/
7+
- buildbot-custom
8+
cache:
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+
330
build_script:
4-
- cmd: PCbuild\build.bat -e
31+
- cmd: PCbuild\build.bat -e
32+
- cmd: PCbuild\win32\python.exe -m test.pythoninfo
533
test_script:
6-
- cmd: PCbuild\rt.bat -q -uall -rwW --slowest --timeout=1200 -j0
7-
8-
# Only trigger AppVeyor if actual code or its configuration changes
9-
only_commits:
10-
files:
11-
- .github/appveyor.yml
12-
- .gitattributes
13-
- Grammar/
14-
- Include/
15-
- Lib/
16-
- Modules/
17-
- Objects/
18-
- PC/
19-
- PCBuild/
20-
- Parser/
21-
- Programs/
22-
- Python/
23-
- Tools/
34+
- cmd: PCbuild\rt.bat -q -uall -u-cpu -u-largefile -rwW --slowest --timeout=1200 --fail-env-changed -j0
35+
environment:
36+
HOST_PYTHON: C:\Python36\python.exe
37+
image:
38+
- Visual Studio 2017

.github/codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
codecov:
2+
strict_yaml_branch: master
23
notify:
34
require_ci_to_pass: true
45
comment: off

.gitignore

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
# added for local development
2+
.buildaix/
3+
Modules/python.exp
4+
buildaix/
5+
installp/
6+
.gitignore
7+
18
# Two-trick pony for OSX and other case insensitive file systems:
29
# Ignore ./python binary on Unix but still look into ./Python/ directory.
310
/python
411
!/Python/
512
*.cover
13+
*.iml
614
*.o
715
*.orig
816
*.pyc
@@ -18,6 +26,9 @@
1826
.gdb_history
1927
Doc/build/
2028
Doc/venv/
29+
Doc/.venv/
30+
Doc/env/
31+
Doc/.env/
2132
Include/pydtrace_probes.h
2233
Lib/distutils/command/*.pdb
2334
Lib/lib2to3/*.pickle
@@ -59,7 +70,7 @@ PCbuild/*.VC.opendb
5970
PCbuild/.vs/
6071
PCbuild/amd64/
6172
PCbuild/obj/
62-
PCBuild/win32/
73+
PCbuild/win32/
6374
.purify
6475
Parser/pgen
6576
Parser/pgen.exe
@@ -74,6 +85,7 @@ config.status.lineno
7485
core
7586
db_home
7687
.hg/
88+
.idea/
7789
ipch/
7890
libpython*.a
7991
libpython*.so*
@@ -101,3 +113,5 @@ Tools/ssl/amd64
101113
Tools/ssl/win32
102114
.vs/
103115
.vscode/
116+
gmon.out
117+
.mypy_cache/

0 commit comments

Comments
 (0)