diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7da18f2b..06ac8bec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: "3.8", "3.9", "3.10", - "3.11.0-beta.1", + "3.11-dev", "pypy-3.7", "pypy-3.8", "pypy-3.9" @@ -346,8 +346,9 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 + id: setup-python with: - python-version: 3.11.0-beta.1 + python-version: 3.11-dev - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: @@ -362,12 +363,12 @@ jobs: with: path: | .nox/emscripten - key: ${{ hashFiles('emscripten/*') }} - ${{ hashFiles('noxfile.py') }} + key: ${{ hashFiles('emscripten/*') }} - ${{ hashFiles('noxfile.py') }} - ${{ steps.setup-python.outputs.python-path }} - uses: Swatinem/rust-cache@v1 with: key: cargo-emscripten-wasm32 - name: Build if: steps.cache.outputs.cache-hit != 'true' - run: nox -s build_emscripten + run: nox -s build-emscripten - name: Test - run: nox -s test_emscripten + run: nox -s test-emscripten diff --git a/noxfile.py b/noxfile.py index 52c8b40c..e1b918f8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,7 +1,8 @@ +import re +import sys import time from glob import glob from pathlib import Path -import re import nox @@ -139,7 +140,7 @@ class EmscriptenInfo: self.builddir = rootdir / ".nox/emscripten" self.builddir.mkdir(exist_ok=True, parents=True) - self.pyversion = "3.11.0b1" + self.pyversion = sys.version.split()[0] self.pymajor, self.pyminor, self.pymicro = self.pyversion.split(".") self.pymicro, self.pydev = re.match( "([0-9]*)([^0-9].*)?", self.pymicro @@ -151,7 +152,7 @@ class EmscriptenInfo: self.pymajorminormicro = f"{self.pymajorminor}.{self.pymicro}" -@nox.session(venv_backend="none") +@nox.session(name="build-emscripten", venv_backend="none") def build_emscripten(session: nox.Session): info = EmscriptenInfo() session.run( @@ -165,7 +166,7 @@ def build_emscripten(session: nox.Session): ) -@nox.session(venv_backend="none") +@nox.session(name="test-emscripten", venv_backend="none") def test_emscripten(session: nox.Session): info = EmscriptenInfo()