From dc546ce26ec0df3a40222feb99dc039acb6483b8 Mon Sep 17 00:00:00 2001 From: mattip Date: Wed, 6 Nov 2024 10:26:20 +0200 Subject: [PATCH 1/2] add pypy-3.11-nightly runs --- .github/workflows/cython.yml | 2 +- .github/workflows/nanobind.yml | 2 +- .github/workflows/numpy.yml | 2 +- .github/workflows/pybind11.yml | 2 +- .github/workflows/pyo3.yml | 2 +- .github/workflows/pytest-html.yml | 2 +- .github/workflows/pythran.yml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cython.yml b/.github/workflows/cython.yml index c85b83f..7564bc8 100644 --- a/.github/workflows/cython.yml +++ b/.github/workflows/cython.yml @@ -26,7 +26,7 @@ jobs: matrix: os: [ubuntu, windows, macOS] backend: [c] - python_version: [pypy-3.10-nightly, pypy-3.9-nightly] + python_version: [pypy-3.10-nightly, pypy-3.11-nightly] extra_cflags: ['', '-DCYTHON_USE_TYPE_SPECS=1'] include: - os: windows diff --git a/.github/workflows/nanobind.yml b/.github/workflows/nanobind.yml index 6100254..fd0d8ff 100644 --- a/.github/workflows/nanobind.yml +++ b/.github/workflows/nanobind.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest', 'ubuntu-latest', 'ubuntu-latest', 'ubuntu-latest'] - python: ['pypy3.9-nightly', 'pypy3.10-nightly'] + python: ['pypy-3.11-nightly', 'pypy-3.10-nightly'] name: "Python ${{ matrix.python }} / ${{ matrix.os }}" runs-on: ${{ matrix.os }} diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index ec1856e..e60394a 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python_version: [pypy-3.10-nightly] + python_version: [pypy-3.11-nightly] timeout-minutes: 120 diff --git a/.github/workflows/pybind11.yml b/.github/workflows/pybind11.yml index 57914a3..1bdc426 100644 --- a/.github/workflows/pybind11.yml +++ b/.github/workflows/pybind11.yml @@ -35,7 +35,7 @@ jobs: runs-on: [ubuntu-latest, windows-2022, macos-latest] python: - 'pypy-3.10-nightly' - - 'pypy-3.9-nightly' + - 'pypy-3.11-nightly' # Items in here will either be added to the build matrix (if not # present), or add new keys to an existing matrix element if all the diff --git a/.github/workflows/pyo3.yml b/.github/workflows/pyo3.yml index afc2113..be59570 100644 --- a/.github/workflows/pyo3.yml +++ b/.github/workflows/pyo3.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python_version: [pypy-3.10-nightly, pypy-3.9-nightly] + python_version: [pypy-3.10-nightly, pypy-3.11-nightly] timeout-minutes: 20 diff --git a/.github/workflows/pytest-html.yml b/.github/workflows/pytest-html.yml index bcc6c1c..ed6b75f 100644 --- a/.github/workflows/pytest-html.yml +++ b/.github/workflows/pytest-html.yml @@ -36,7 +36,7 @@ jobs: - os: windows-latest name: pypy3.9-nightly-windows toxname: pypy3 - python-version: pypy-3.9-nightly + python-version: pypy-3.11-nightly steps: - name: Set Newline Behavior diff --git a/.github/workflows/pythran.yml b/.github/workflows/pythran.yml index 83c4c6e..a8069fb 100644 --- a/.github/workflows/pythran.yml +++ b/.github/workflows/pythran.yml @@ -28,8 +28,8 @@ jobs: os: [ubuntu-20.04] cpp-version: [g++-8, clang-7] python_version: - - [pypy-3.10-nightly, pypy10] - - [pypy-3.9-nightly, pypy39] + - [pypy-3.10-nightly, pypy310] + - [pypy-3.11-nightly, pypy311] steps: - uses: actions/setup-python@v5.0.0 with: From 5fd7b68d6593aeebd8ea720f4f18fbc1344568df Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 8 Nov 2024 12:35:23 +0200 Subject: [PATCH 2/2] use cytohn HEAD for numpy --- .github/workflows/cython.yml | 8 ++++---- .github/workflows/nanobind.yml | 4 ++-- .github/workflows/numpy.yml | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cython.yml b/.github/workflows/cython.yml index 7564bc8..dc5a541 100644 --- a/.github/workflows/cython.yml +++ b/.github/workflows/cython.yml @@ -64,15 +64,15 @@ jobs: if : ${{ matrix.os == 'ubuntu' }} run: | python -m pip install --upgrade pip - python -m pip install numpy -Csetup-args="-Dallow-noblas=true" - python -m pip install pythran --no-build-isolation + # python -m pip install numpy -Csetup-args="-Dallow-noblas=true" + # python -m pip install pythran --no-build-isolation - name: install external dependencies if : ${{ matrix.os == 'macos' }} run: | python -m pip install --upgrade pip - python -m pip install numpy -Csetup-args="-Dallow-noblas=true" - python -m pip install pythran --no-build-isolation + # python -m pip install numpy -Csetup-args="-Dallow-noblas=true" + # python -m pip install pythran --no-build-isolation - name: Enable long paths on Windows if: startsWith(runner.os, 'Windows') diff --git a/.github/workflows/nanobind.yml b/.github/workflows/nanobind.yml index fd0d8ff..281a34c 100644 --- a/.github/workflows/nanobind.yml +++ b/.github/workflows/nanobind.yml @@ -24,10 +24,10 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'ubuntu-latest', 'ubuntu-latest', 'ubuntu-latest'] + os: ['ubuntu-latest'] python: ['pypy-3.11-nightly', 'pypy-3.10-nightly'] - name: "Python ${{ matrix.python }} / ${{ matrix.os }}" + name: "${{ matrix.python }} / ${{ matrix.os }}" runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index e60394a..f7ac8c4 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -69,7 +69,11 @@ jobs: run: | cd repo python -c "import os; print('PKG_CONFIG_PATH', os.environ['PKG_CONFIG_PATH'])" - python -m pip install . -v -Csetup-args="--vsenv" + # python -m pip install . -v -Csetup-args="--vsenv" + # Use a newer cython + python -m pip install -r requirements/build_requirements.txt + python -m pip install git+https://github.com/cython/cython.git + python -m pip install --no-build-isolation . -v -Csetup-args="--vsenv" - name: Test shell: bash