From 5fd7b68d6593aeebd8ea720f4f18fbc1344568df Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 8 Nov 2024 12:35:23 +0200 Subject: [PATCH] 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