From c4276329a35ecf216c9410c56dbd232df20210b9 Mon Sep 17 00:00:00 2001 From: Eric Cousineau Date: Mon, 8 Jul 2024 19:43:39 -0400 Subject: [PATCH] fixup! --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed08f78b309..3ac9329572d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,9 +39,9 @@ jobs: # - 'pypy-3.8' # - 'pypy-3.9' # - 'pypy-3.10' - use_numpy_2: - - false - - true + numpy_version: + - '1.x' + - '2.x' # 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 @@ -69,7 +69,7 @@ jobs: # - runs-on: windows-2019 # python: '2.7' - name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}" + name: "🐍 ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 • NumPy ${{ matrix.numpy_version }} • ${{ matrix.args }}" runs-on: ${{ matrix.runs-on }} steps: @@ -108,7 +108,7 @@ jobs: python -m pip install -r tests/requirements.txt - name: Install NumPy >= 2 - if: matrix.use_numpy_2 + if: matrix.numpy_version == '2.x' run: pip install 'numpy>=2.0.0b1' - name: Setup annotations on Linux @@ -124,7 +124,7 @@ jobs: -DPYBIND11_WERROR=ON -DPYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION=ON -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON - -DPYBIND11_NUMPY_1_ONLY=ON + -DPYBIND11_NUMPY_1_ONLY=${{ matrix.numpy_version == '1.x' && "ON" || "OFF" }} -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON -DCMAKE_CXX_STANDARD=11