Skip to content

Commit

Permalink
build: support Python 3.10.0
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
iam-frankqiu authored and Trott committed Oct 7, 2021
1 parent 24c403c commit 7752088
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-tarball.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
build-tarball:
if: github.event.pull_request.draft == false
env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -52,7 +52,7 @@ jobs:
path: tarballs
test-tarball-linux:
env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
needs: build-tarball
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- v[0-9]+.x

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- 'tools/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- v[0-9]+.x

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
NODE_VERSION: lts/*

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-internet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- test/internet/**

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- v[0-9]+.x

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- 'doc/**'

env:
PYTHON_VERSION: 3.9
PYTHON_VERSION: '3.10'
FLAKY_TESTS: dontcare

jobs:
Expand Down
4 changes: 2 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ The Node.js project supports Python >= 3 for building and testing.

* `gcc` and `g++` >= 8.3 or newer, or
* GNU Make 3.81 or newer
* Python 3.6, 3.7, 3.8, or 3.9 (see note above)
* Python 3.6, 3.7, 3.8, 3.9, or 3.10 (see note above)

Installation via Linux package manager can be achieved with:

Expand All @@ -250,7 +250,7 @@ FreeBSD and OpenBSD users may also need to install `libexecinfo`.
#### macOS prerequisites

* Xcode Command Line Tools >= 11 for macOS
* Python 3.6, 3.7, 3.8, or 3.9 (see note above)
* Python 3.6, 3.7, 3.8, 3.9, or 3.10 (see note above)

macOS users can install the `Xcode Command Line Tools` by running
`xcode-select --install`. Alternatively, if you already have the full Xcode
Expand Down
3 changes: 2 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Note that the mix of single and double quotes is intentional,
# as is the fact that the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
Expand All @@ -21,7 +22,7 @@ except ImportError:
from distutils.spawn import find_executable as which

print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6))
acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
if sys.version_info[:2] in acceptable_pythons:
import configure
else:
Expand Down

0 comments on commit 7752088

Please sign in to comment.