From f9b3bec676cea24b1bd22573a529d3b31da0b719 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Wed, 26 Oct 2022 15:01:59 +0200 Subject: [PATCH 1/2] build: support Python 3.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/45191 Reviewed-By: Rich Trott Reviewed-By: Moshe Atlow Reviewed-By: Richard Lau Reviewed-By: Christian Clauss Reviewed-By: Yagiz Nizipli Reviewed-By: James M Snell Reviewed-By: Jiawen Geng Reviewed-By: Juan José Arboleda --- BUILDING.md | 6 +++--- configure | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 0ae3c09d99fb0b..149c2d9c3bc82f 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -240,7 +240,7 @@ test with Python 3. * GNU Make 3.81 or newer * Python (see note above) * Python 2.7 - * Python 3.5, 3.6, 3.7, 3.8, 3.9 or 3.10 (see note above) + * Python >=3.5 <=3.11 (see note above) Installation via Linux package manager can be achieved with: @@ -257,7 +257,7 @@ FreeBSD and OpenBSD users may also need to install `libexecinfo`. * Xcode Command Line Tools >= 10 for macOS * Python (see note above) * Python 2.7 - * Python 3.6, 3.7, 3.8, 3.9, or 3.10 (see note above) + * Python >=3.5 <=3.11 (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 @@ -561,7 +561,7 @@ to run it again before invoking `make -j4`. ##### Option 1: Manual install -* [Python 3.8](https://www.python.org/downloads/) +* [Python 3.11](https://apps.microsoft.com/store/detail/python-311/9NRWMJP3717K) * The "Desktop development with C++" workload from [Visual Studio 2017 or 2019](https://visualstudio.microsoft.com/downloads/) or the "Visual C++ build tools" workload from the diff --git a/configure b/configure index debd3cc3d452d0..d536a52a8a0e11 100755 --- a/configure +++ b/configure @@ -5,6 +5,7 @@ # as is the fact that the ] goes on a new line. _=[ 'exec' '/bin/sh' '-c' ''' test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient +command -v python3.11 >/dev/null && exec python3.11 "$0" "$@" 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" "$@" @@ -25,7 +26,7 @@ except ImportError: from distutils.spawn import find_executable as which print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info)) -acceptable_pythons = ((3,10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7)) +acceptable_pythons = ((3,11), (3,10), (3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7)) if sys.version_info[:2] in acceptable_pythons: import configure else: From 83f20a2eb5e88605afad697b14ed5707479d1292 Mon Sep 17 00:00:00 2001 From: Luigi Pinca Date: Wed, 26 Oct 2022 16:10:18 +0200 Subject: [PATCH 2/2] tools: use Python 3.11 in GitHub Actions workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/45191 Reviewed-By: Rich Trott Reviewed-By: Moshe Atlow Reviewed-By: Richard Lau Reviewed-By: Christian Clauss Reviewed-By: Yagiz Nizipli Reviewed-By: James M Snell Reviewed-By: Jiawen Geng Reviewed-By: Juan José Arboleda --- .github/workflows/build-tarball.yml | 2 +- .github/workflows/build-windows.yml | 2 +- .github/workflows/linters.yml | 2 +- .github/workflows/test-asan.yml | 2 +- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index b845562ae38715..176f70f322d5d1 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -11,7 +11,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' FLAKY_TESTS: keep_retrying jobs: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 57b328fc7e9e5f..36281ed6fd068e 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -12,7 +12,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' FLAKY_TESTS: keep_retrying jobs: diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 0264edaa940738..1fe913f48d4c55 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -11,7 +11,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' NODE_VERSION: lts/* jobs: diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index b6860a77b0fcb8..2199eab1713071 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -18,7 +18,7 @@ on: - 'doc/**' env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' FLAKY_TESTS: keep_retrying jobs: diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 080ef942be55c2..3ad570d466a1d8 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -12,7 +12,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' FLAKY_TESTS: keep_retrying jobs: diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 564a22f5de08e8..d92d150614091b 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -18,7 +18,7 @@ on: - 'doc/**' env: - PYTHON_VERSION: '3.10' + PYTHON_VERSION: '3.11' FLAKY_TESTS: keep_retrying jobs: