From a87d041ab72d5a890da1aa2df75bad368e2dec1b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 5 Oct 2023 08:39:31 -0400 Subject: [PATCH] Bump default CI job to 3.12 (#9697) --- .github/workflows/ci.yml | 47 +++++++++++++++++++------------------- docs/spelling_wordlist.txt | 1 + noxfile.py | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a18f630c735..35e7d95fa327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,35 +27,34 @@ jobs: fail-fast: false matrix: PYTHON: - - {VERSION: "3.11", NOXSESSION: "flake"} - - {VERSION: "3.11", NOXSESSION: "rust"} - - {VERSION: "3.11", NOXSESSION: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3"}} + - {VERSION: "3.12", NOXSESSION: "flake"} + - {VERSION: "3.12", NOXSESSION: "rust"} + - {VERSION: "3.12", NOXSESSION: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3"}} - {VERSION: "pypy-3.9", NOXSESSION: "tests-nocoverage"} - {VERSION: "pypy-3.10", NOXSESSION: "tests-nocoverage"} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1w"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.0.11"}} - - {VERSION: "3.11", NOXSESSION: "tests-ssh", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3", CONFIG_FLAGS: "no-legacy", NO_LEGACY: "1"}} - - {VERSION: "3.11", NOXSESSION: "tests", NOXARGS: "--enable-fips=1", OPENSSL: {TYPE: "openssl", CONFIG_FLAGS: "enable-fips", VERSION: "3.1.3"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.2.0-alpha2"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.6.3"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.7.3"}} - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.8.1"}} - - {VERSION: "3.11", NOXSESSION: "tests-randomorder"} - - {VERSION: "3.12", NOXSESSION: "tests"} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1w"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.0.11"}} + - {VERSION: "3.12", NOXSESSION: "tests-ssh", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3", CONFIG_FLAGS: "no-engine no-rc2 no-srtp no-ct no-psk"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.1.3", CONFIG_FLAGS: "no-legacy", NO_LEGACY: "1"}} + - {VERSION: "3.12", NOXSESSION: "tests", NOXARGS: "--enable-fips=1", OPENSSL: {TYPE: "openssl", CONFIG_FLAGS: "enable-fips", VERSION: "3.1.3"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "3.2.0-alpha2"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.6.3"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.7.3"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "libressl", VERSION: "3.8.1"}} + - {VERSION: "3.12", NOXSESSION: "tests-randomorder"} # Latest commit on the BoringSSL master branch, as of Oct 04, 2023. - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "boringssl", VERSION: "81ed2b3f6a135449772c46980067b8d4f71f5c82"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "boringssl", VERSION: "81ed2b3f6a135449772c46980067b8d4f71f5c82"}} # Latest commit on the OpenSSL master branch, as of Oct 05, 2023. - - {VERSION: "3.11", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "11f69aa50771d50151fa24c55fd0858db30517df"}} + - {VERSION: "3.12", NOXSESSION: "tests", OPENSSL: {TYPE: "openssl", VERSION: "11f69aa50771d50151fa24c55fd0858db30517df"}} # Builds with various Rust versions. Includes MSRV and next # potential future MSRV: # 1.64 - maturin # 1.65 - Generic associated types (GATs) - - {VERSION: "3.11", NOXSESSION: "rust-noclippy,tests", RUST: "1.63.0"} - - {VERSION: "3.11", NOXSESSION: "rust,tests", RUST: "1.64.0"} - - {VERSION: "3.11", NOXSESSION: "rust,tests", RUST: "beta"} - - {VERSION: "3.11", NOXSESSION: "rust,tests", RUST: "nightly"} + - {VERSION: "3.12", NOXSESSION: "rust-noclippy,tests", RUST: "1.63.0"} + - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "1.64.0"} + - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "beta"} + - {VERSION: "3.12", NOXSESSION: "rust,tests", RUST: "nightly"} timeout-minutes: 15 steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 @@ -223,7 +222,7 @@ jobs: - {OS: [self-hosted, macos, ARM64, tart], ARCH: 'arm64'} PYTHON: - {VERSION: "3.7", NOXSESSION: "tests-nocoverage"} - - {VERSION: "3.11", NOXSESSION: "tests"} + - {VERSION: "3.12", NOXSESSION: "tests"} exclude: # We only test latest Python on arm64. py37 won't work since there's no universal2 binary - PYTHON: {VERSION: "3.7", NOXSESSION: "tests-nocoverage"} @@ -291,7 +290,7 @@ jobs: - {ARCH: 'x64', WINDOWS: 'win64'} PYTHON: - {VERSION: "3.7", NOXSESSION: "tests-nocoverage"} - - {VERSION: "3.11", NOXSESSION: "tests"} + - {VERSION: "3.12", NOXSESSION: "tests"} timeout-minutes: 15 steps: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 @@ -422,7 +421,7 @@ jobs: if: ${{ always() }} uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 with: - python-version: '3.11' + python-version: '3.12' cache: pip cache-dependency-path: ci-constraints-requirements.txt - run: pip install -c ci-constraints-requirements.txt coverage[toml] diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index 485f452db014..60113c130caa 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -114,6 +114,7 @@ Schneier scrypt serializer Serializers +setuptools SHA Solaris Sur diff --git a/noxfile.py b/noxfile.py index f64827477d6a..472bc6cb6608 100644 --- a/noxfile.py +++ b/noxfile.py @@ -184,7 +184,7 @@ def rust(session: nox.Session) -> None: # Just install the dependencies needed for the Rust build.rs # TODO: Ideally there'd be a pip flag to install just our dependencies, # but not install us. - install(session, "cffi") + install(session, "cffi", "setuptools") with session.chdir("src/rust/"): session.run("cargo", "fmt", "--all", "--", "--check", external=True)