Skip to content

Commit 5839ebb

Browse files
iam-frankqiurichardlau
authored andcommitted
build: support Python 3.10.0
PR-URL: nodejs#40296 Fixes: nodejs#40294 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Christian Clauss <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
1 parent be77dd7 commit 5839ebb

8 files changed

+11
-10
lines changed

.github/workflows/build-tarball.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
build-tarball:
1818
env:
19-
PYTHON_VERSION: 3.9
19+
PYTHON_VERSION: '3.10'
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v2
@@ -41,7 +41,7 @@ jobs:
4141
path: tarballs
4242
test-tarball-linux:
4343
env:
44-
PYTHON_VERSION: 3.9
44+
PYTHON_VERSION: '3.10'
4545
needs: build-tarball
4646
runs-on: ubuntu-latest
4747
steps:

.github/workflows/build-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- v[0-9]+.x
1313

1414
env:
15-
PYTHON_VERSION: 3.9
15+
PYTHON_VERSION: '3.10'
1616
FLAKY_TESTS: dontcare
1717

1818
jobs:

.github/workflows/linters.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- v[0-9]+.x
1212

1313
env:
14-
PYTHON_VERSION: 3.9
14+
PYTHON_VERSION: '3.10'
1515
NODE_VERSION: lts/*
1616

1717
jobs:

.github/workflows/test-asan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- 'doc/**'
1919

2020
env:
21-
PYTHON_VERSION: 3.9
21+
PYTHON_VERSION: '3.10'
2222
FLAKY_TESTS: dontcare
2323

2424
jobs:

.github/workflows/test-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- v[0-9]+.x
1313

1414
env:
15-
PYTHON_VERSION: 3.9
15+
PYTHON_VERSION: '3.10'
1616
FLAKY_TESTS: dontcare
1717

1818
jobs:

.github/workflows/test-macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- 'doc/**'
1919

2020
env:
21-
PYTHON_VERSION: 3.9
21+
PYTHON_VERSION: '3.10'
2222
FLAKY_TESTS: dontcare
2323

2424
jobs:

BUILDING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ test with Python 3.
239239
* GNU Make 3.81 or newer
240240
* Python (see note above)
241241
* Python 2.7
242-
* Python 3.5, 3.6, 3.7, or 3.8
242+
* Python 3.5, 3.6, 3.7, 3.8, 3.9 or 3.10 (see note above)
243243

244244
Installation via Linux package manager can be achieved with:
245245

@@ -256,7 +256,7 @@ FreeBSD and OpenBSD users may also need to install `libexecinfo`.
256256
* Xcode Command Line Tools >= 10 for macOS
257257
* Python (see note above)
258258
* Python 2.7
259-
* Python 3.5, 3.6, 3.7, or 3.8
259+
* Python 3.6, 3.7, 3.8, 3.9, or 3.10 (see note above)
260260

261261
macOS users can install the `Xcode Command Line Tools` by running
262262
`xcode-select --install`. Alternatively, if you already have the full Xcode

configure

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# as is the fact that the ] goes on a new line.
66
_=[ 'exec' '/bin/sh' '-c' '''
77
test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient
8+
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
89
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
910
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
1011
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
@@ -24,7 +25,7 @@ except ImportError:
2425
from distutils.spawn import find_executable as which
2526

2627
print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
27-
acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
28+
acceptable_pythons = ((3,10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
2829
if sys.version_info[:2] in acceptable_pythons:
2930
import configure
3031
else:

0 commit comments

Comments
 (0)