From 7b408b5e3bca9924744dcd4b4a8b39473f22e34f Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:12:53 -0500 Subject: [PATCH 1/8] parameterize numpy --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42c82a78..424d263e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] python-version: ['3.9', '3.10', '3.11', '3.12'] + numpy-version: ['1.22', '2.0'] steps: - name: Check out python-pdal @@ -47,6 +48,10 @@ jobs: auto-update-conda: true environment-file: .github/environment.yml + - name: Install numpy ${{ matrix.numpy-version }} + run: | + mamba install -y ${{ matrix-numpy-version }} + - name: Install python-pdal run: | pip install -vv . --no-deps --no-build-isolation From f993cb2d39b57e29f28cac1e006f782e464c30ba Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:14:17 -0500 Subject: [PATCH 2/8] typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 424d263e..6079ae53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Install numpy ${{ matrix.numpy-version }} run: | - mamba install -y ${{ matrix-numpy-version }} + mamba install -y ${{ matrix.numpy-version }} - name: Install python-pdal run: | From a6dd7673578be6ec9926b0bfa243b463ca459040 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:17:15 -0500 Subject: [PATCH 3/8] specify numpy --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6079ae53..7a50aab7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Install numpy ${{ matrix.numpy-version }} run: | - mamba install -y ${{ matrix.numpy-version }} + mamba install -y numpy=${{ matrix.numpy-version }} - name: Install python-pdal run: | From a86e22cd357859ad007332acd17cc803f11d8201 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:36:49 -0500 Subject: [PATCH 4/8] exclude 3.12 + 1.22 --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a50aab7..f2d78879 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] python-version: ['3.9', '3.10', '3.11', '3.12'] numpy-version: ['1.22', '2.0'] + exclude: + - python-version: '3.12' + - sidx-version: '1.22' steps: - name: Check out python-pdal From c67f7072245351ffda4f40dd4d488b86f65968c2 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:37:55 -0500 Subject: [PATCH 5/8] typo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2d78879..d3247eb2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: numpy-version: ['1.22', '2.0'] exclude: - python-version: '3.12' - - sidx-version: '1.22' + - numpy-version: '1.22' steps: - name: Check out python-pdal From 463d68db99fe166dfc0117fc5aa6f0abe5f58a36 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:41:59 -0500 Subject: [PATCH 6/8] more precise exclude --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3247eb2..5e96039a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: numpy-version: ['1.22', '2.0'] exclude: - python-version: '3.12' - - numpy-version: '1.22' + numpy-version: '1.22' steps: - name: Check out python-pdal From e527384c7401b6f47e679b52040c2190bdd490bc Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 10:44:39 -0500 Subject: [PATCH 7/8] ID the job --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e96039a..d7f73c15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ defaults: jobs: build: - name: Build ${{ matrix.os }} py${{ matrix.python-version }} + name: Build ${{ matrix.os }} py${{ matrix.python-version }} numpy ${{ matrix.numpy-version }} runs-on: ${{ matrix.os }} strategy: From 6bac018e76641df64a49d05b3cad814f2abbb9b9 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 18 Jun 2024 11:04:44 -0500 Subject: [PATCH 8/8] increase to 1.24 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7f73c15..47180b8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ defaults: jobs: build: - name: Build ${{ matrix.os }} py${{ matrix.python-version }} numpy ${{ matrix.numpy-version }} + name: ${{ matrix.os }} py${{ matrix.python-version }} numpy ${{ matrix.numpy-version }} runs-on: ${{ matrix.os }} strategy: @@ -25,10 +25,10 @@ jobs: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] python-version: ['3.9', '3.10', '3.11', '3.12'] - numpy-version: ['1.22', '2.0'] + numpy-version: ['1.24', '2.0'] exclude: - python-version: '3.12' - numpy-version: '1.22' + numpy-version: '1.24' steps: - name: Check out python-pdal