Skip to content

Commit 6d721a0

Browse files
domragusadomragusa
committed
resolve conflicts with pythonGH-19611 
2 parents ec64368 + fda7f6d commit 6d721a0

631 files changed

Lines changed: 55387 additions & 17194 deletions

File tree

Some content is hidden

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

‎.github/CONTRIBUTING.rst‎

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

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

11-
- 3.7
11+
- 3.9
1212

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

15-
- 3.6
15+
- 3.8
1616

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

19-
- 2.7
19+
- 3.7
2020

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

2323

2424
Thank You

‎.github/problem-matchers/sphinx.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "sphinx-problem-matcher",
5+
"pattern": [
6+
{
7+
"regexp": "^(.*):(\\d+):\\s+(\\w*):\\s+(.*)$",
8+
"file": 1,
9+
"line": 2,
10+
"severity": 3,
11+
"message": 4
12+
}
13+
]
14+
},
15+
{
16+
"owner": "sphinx-problem-matcher-loose",
17+
"pattern": [
18+
{
19+
"_comment": "A bit of a looser pattern, doesn't look for line numbers, just looks for file names relying on them to start with / and end with .rst",
20+
"regexp": "(\/.*\\.rst):\\s+(\\w*):\\s+(.*)$",
21+
"file": 1,
22+
"severity": 2,
23+
"message": 3
24+
}
25+
]
26+
},
27+
{
28+
"owner": "sphinx-problem-matcher-loose-no-severity",
29+
"pattern": [
30+
{
31+
"_comment": "Looks for file names ending with .rst and line numbers but without severity",
32+
"regexp": "^(.*\\.rst):(\\d+):(.*)$",
33+
"file": 1,
34+
"line": 2,
35+
"message": 3
36+
}
37+
]
38+
}
39+
]
40+
}

‎.github/workflows/build.yml‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,46 @@
11
name: Tests
22

3+
# bpo-40548: "paths-ignore" is not used to skip documentation-only PRs, because
4+
# it prevents to mark a job as mandatory. A PR cannot be merged if a job is
5+
# mandatory but not scheduled because of "paths-ignore".
36
on:
47
push:
58
branches:
69
- master
10+
- 3.9
711
- 3.8
812
- 3.7
9-
paths-ignore:
10-
- 'Doc/**'
11-
- 'Misc/**'
12-
- '**/*.md'
13-
- '**/*.rst'
1413
pull_request:
1514
branches:
1615
- master
16+
- 3.9
1717
- 3.8
1818
- 3.7
19-
paths-ignore:
20-
- 'Doc/**'
21-
- 'Misc/**'
22-
- '**/*.md'
23-
- '**/*.rst'
2419

2520
jobs:
21+
check_source:
22+
name: 'Check for source changes'
23+
runs-on: ubuntu-latest
24+
outputs:
25+
run_tests: ${{ steps.check.outputs.run_tests }}
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: Check for source changes
29+
id: check
30+
run: |
31+
if [ -z "GITHUB_BASE_REF" ]; then
32+
echo '::set-output name=run_tests::true'
33+
else
34+
git fetch origin $GITHUB_BASE_REF --depth=1
35+
git diff --name-only origin/$GITHUB_BASE_REF... | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
36+
fi
2637
build_win32:
2738
name: 'Windows (x86)'
2839
runs-on: windows-latest
40+
needs: check_source
41+
if: needs.check_source.outputs.run_tests == 'true'
2942
steps:
30-
- uses: actions/checkout@v1
43+
- uses: actions/checkout@v2
3144
- name: Build CPython
3245
run: .\PCbuild\build.bat -e -p Win32
3346
- name: Display build info
@@ -38,8 +51,10 @@ jobs:
3851
build_win_amd64:
3952
name: 'Windows (x64)'
4053
runs-on: windows-latest
54+
needs: check_source
55+
if: needs.check_source.outputs.run_tests == 'true'
4156
steps:
42-
- uses: actions/checkout@v1
57+
- uses: actions/checkout@v2
4358
- name: Build CPython
4459
run: .\PCbuild\build.bat -e -p x64
4560
- name: Display build info
@@ -50,8 +65,10 @@ jobs:
5065
build_macos:
5166
name: 'macOS'
5267
runs-on: macos-latest
68+
needs: check_source
69+
if: needs.check_source.outputs.run_tests == 'true'
5370
steps:
54-
- uses: actions/checkout@v1
71+
- uses: actions/checkout@v2
5572
- name: Configure CPython
5673
run: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-dev
5774
- name: Build CPython
@@ -64,10 +81,12 @@ jobs:
6481
build_ubuntu:
6582
name: 'Ubuntu'
6683
runs-on: ubuntu-latest
84+
needs: check_source
85+
if: needs.check_source.outputs.run_tests == 'true'
6786
env:
6887
OPENSSL_VER: 1.1.1f
6988
steps:
70-
- uses: actions/checkout@v1
89+
- uses: actions/checkout@v2
7190
- name: Install Dependencies
7291
run: sudo ./.github/workflows/posix-deps-apt.sh
7392
- name: 'Restore OpenSSL build'

‎.github/workflows/build_msi.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
push:
55
branches:
66
- master
7+
- 3.9
78
- 3.8
89
- 3.7
910
paths:
1011
- 'Tools/msi/**'
1112
pull_request:
1213
branches:
1314
- master
15+
- 3.9
1416
- 3.8
1517
- 3.7
1618
paths:
@@ -21,14 +23,14 @@ jobs:
2123
name: 'Windows (x86) Installer'
2224
runs-on: windows-latest
2325
steps:
24-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v2
2527
- name: Build CPython installer
2628
run: .\Tools\msi\build.bat -x86
2729

2830
build_win_amd64:
2931
name: 'Windows (x64) Installer'
3032
runs-on: windows-latest
3133
steps:
32-
- uses: actions/checkout@v1
34+
- uses: actions/checkout@v2
3335
- name: Build CPython installer
3436
run: .\Tools\msi\build.bat -x64

‎.github/workflows/coverage.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- 3.9
78
- 3.8
89
- 3.7
910
paths-ignore:
@@ -12,6 +13,7 @@ on:
1213
#pull_request:
1314
# branches:
1415
# - master
16+
# - 3.9
1517
# - 3.8
1618
# - 3.7
1719
# paths-ignore:
@@ -25,7 +27,7 @@ jobs:
2527
env:
2628
OPENSSL_VER: 1.1.1f
2729
steps:
28-
- uses: actions/checkout@v1
30+
- uses: actions/checkout@v2
2931
- name: Install Dependencies
3032
run: sudo ./.github/workflows/posix-deps-apt.sh
3133
- name: 'Restore OpenSSL build'
@@ -48,6 +50,7 @@ jobs:
4850
./python -m venv .venv
4951
source ./.venv/bin/activate
5052
python -m pip install -U coverage
53+
python -m pip install -r Misc/requirements-test.txt
5154
python -m test.pythoninfo
5255
- name: 'Tests with coverage'
5356
run: >
@@ -73,7 +76,7 @@ jobs:
7376
name: 'Ubuntu (C Coverage)'
7477
runs-on: ubuntu-latest
7578
steps:
76-
- uses: actions/checkout@v1
79+
- uses: actions/checkout@v2
7780
- name: Install Dependencies
7881
run: sudo ./.github/workflows/posix-deps-apt.sh
7982
- name: Configure CPython

‎.github/workflows/doc.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
#push:
55
# branches:
66
# - master
7+
# - 3.9
78
# - 3.8
89
# - 3.7
910
# paths:
1011
# - 'Doc/**'
1112
pull_request:
1213
branches:
1314
- master
15+
- 3.9
1416
- 3.8
1517
- 3.7
1618
paths:
@@ -22,7 +24,9 @@ jobs:
2224
name: 'Docs'
2325
runs-on: ubuntu-latest
2426
steps:
25-
- uses: actions/checkout@v1
27+
- uses: actions/checkout@v2
28+
- name: Register Sphinx problem matcher
29+
run: echo "::add-matcher::.github/problem-matchers/sphinx.json"
2630
- name: 'Install Dependencies'
2731
run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
2832
- name: 'Configure CPython'
@@ -32,7 +36,7 @@ jobs:
3236
- name: 'Install build dependencies'
3337
run: make -C Doc/ PYTHON=../python venv
3438
- name: 'Build documentation'
35-
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest suspicious html
39+
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W --keep-going -j4" doctest suspicious html
3640
- name: 'Upload'
3741
uses: actions/upload-artifact@v1
3842
with:

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ matrix:
8787
# Need a venv that can parse covered code.
8888
- ./python -m venv venv
8989
- ./venv/bin/python -m pip install -U coverage
90+
- ./venv/bin/python -m pip install -r Misc/requirements-test.txt
9091
- ./venv/bin/python -m test.pythoninfo
9192
script:
9293
# Skip tests that re-run the entire test suite.

‎Doc/c-api/call.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Vectorcall Support API
144144
However, the function ``PyVectorcall_NARGS`` should be used to allow
145145
for future extensions.
146146
147-
This function is not part of the `limited API <stable>`_.
147+
This function is not part of the :ref:`limited API <stable>`.
148148
149149
.. versionadded:: 3.8
150150
@@ -158,7 +158,7 @@ Vectorcall Support API
158158
This is mostly useful to check whether or not *op* supports vectorcall,
159159
which can be done by checking ``PyVectorcall_Function(op) != NULL``.
160160
161-
This function is not part of the `limited API <stable>`_.
161+
This function is not part of the :ref:`limited API <stable>`.
162162
163163
.. versionadded:: 3.8
164164
@@ -172,7 +172,7 @@ Vectorcall Support API
172172
It does not check the :const:`Py_TPFLAGS_HAVE_VECTORCALL` flag
173173
and it does not fall back to ``tp_call``.
174174
175-
This function is not part of the `limited API <stable>`_.
175+
This function is not part of the :ref:`limited API <stable>`.
176176
177177
.. versionadded:: 3.8
178178
@@ -256,7 +256,7 @@ please see individual documentation for details.
256256
Return the result of the call on success, or raise an exception and return
257257
*NULL* on failure.
258258
259-
This function is not part of the `limited API <stable>`_.
259+
This function is not part of the :ref:`limited API <stable>`.
260260
261261
.. versionadded:: 3.9
262262
@@ -343,7 +343,7 @@ please see individual documentation for details.
343343
Return the result of the call on success, or raise an exception and return
344344
*NULL* on failure.
345345
346-
This function is not part of the `limited API <stable>`_.
346+
This function is not part of the :ref:`limited API <stable>`.
347347
348348
.. versionadded:: 3.9
349349
@@ -357,7 +357,7 @@ please see individual documentation for details.
357357
Return the result of the call on success, or raise an exception and return
358358
*NULL* on failure.
359359
360-
This function is not part of the `limited API <stable>`_.
360+
This function is not part of the :ref:`limited API <stable>`.
361361
362362
.. versionadded:: 3.9
363363
@@ -372,7 +372,7 @@ please see individual documentation for details.
372372
Return the result of the call on success, or raise an exception and return
373373
*NULL* on failure.
374374
375-
This function is not part of the `limited API <stable>`_.
375+
This function is not part of the :ref:`limited API <stable>`.
376376
377377
.. versionadded:: 3.9
378378
@@ -388,7 +388,7 @@ please see individual documentation for details.
388388
already has a dictionary ready to use for the keyword arguments,
389389
but not a tuple for the positional arguments.
390390
391-
This function is not part of the `limited API <stable>`_.
391+
This function is not part of the :ref:`limited API <stable>`.
392392
393393
.. versionadded:: 3.9
394394
@@ -410,7 +410,7 @@ please see individual documentation for details.
410410
Return the result of the call on success, or raise an exception and return
411411
*NULL* on failure.
412412
413-
This function is not part of the `limited API <stable>`_.
413+
This function is not part of the :ref:`limited API <stable>`.
414414
415415
.. versionadded:: 3.9
416416

‎Doc/c-api/init_config.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@ Private provisional API:
10041004
10051005
* :c:member:`PyConfig._init_main`: if set to 0,
10061006
:c:func:`Py_InitializeFromConfig` stops at the "Core" initialization phase.
1007+
* :c:member:`PyConfig._isolated_interpreter`: if non-zero,
1008+
disallow threads, subprocesses and fork.
10071009
10081010
.. c:function:: PyStatus _Py_InitializeMain(void)
10091011

0 commit comments

Comments
 (0)