From c6ce8e90af07caa1d1b3b68fc9953dccbfecf3b7 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Mon, 13 May 2024 08:18:30 -0700 Subject: [PATCH 1/4] Bump sysroot_linux-64 to 2.17 in CI --- continuous_integration/environment-3.10.yaml | 1 + continuous_integration/environment-3.11.yaml | 1 + continuous_integration/environment-3.12.yaml | 1 + continuous_integration/environment-3.9.yaml | 1 + continuous_integration/gpuci/environment-3.10.yaml | 1 + continuous_integration/gpuci/environment-3.9.yaml | 1 + 6 files changed, 6 insertions(+) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 6ee044f42..8c81ae51a 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -3,6 +3,7 @@ channels: - conda-forge dependencies: - c-compiler +- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index 9edaddbbd..8dffd729c 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -3,6 +3,7 @@ channels: - conda-forge dependencies: - c-compiler +- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index 657e18507..e99dca895 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -3,6 +3,7 @@ channels: - conda-forge dependencies: - c-compiler +- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.9.yaml b/continuous_integration/environment-3.9.yaml index 88eee32b5..2809510a1 100644 --- a/continuous_integration/environment-3.9.yaml +++ b/continuous_integration/environment-3.9.yaml @@ -3,6 +3,7 @@ channels: - conda-forge dependencies: - c-compiler +- sysroot_linux-64=2.17 - dask=2024.4.1 - dask-expr=1.0.11 - fastapi=0.92.0 diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index 2371144e7..b0d222608 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -8,6 +8,7 @@ channels: - nodefaults dependencies: - c-compiler +- sysroot_linux-64>=2.17 - zlib - dask>=2024.4.1 - dask-expr>=1.0.11 diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml index cb54b2ac7..0f420dc8c 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -8,6 +8,7 @@ channels: - nodefaults dependencies: - c-compiler +- sysroot_linux-64>=2.17 - zlib - dask>=2024.4.1 - dask-expr>=1.0.11 From 66563e68fd1e5f826566940b45df4663b156177e Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Mon, 13 May 2024 12:00:52 -0700 Subject: [PATCH 2/4] Easier fix? Pin to rust 1.72 in CI for now --- .github/workflows/rust.yml | 6 ++++++ .github/workflows/test-upstream.yml | 6 ++++++ .github/workflows/test.yml | 9 +++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 22e281f7b..1182ce72e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,6 +38,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.72 - name: Cache Cargo uses: actions/cache@v3 with: @@ -63,6 +66,9 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.72 - name: Cache Cargo uses: actions/cache@v3 with: diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml index e2b03c87c..c47060f87 100644 --- a/.github/workflows/test-upstream.yml +++ b/.github/workflows/test-upstream.yml @@ -56,6 +56,9 @@ jobs: channel-priority: strict activate-environment: dask-sql environment-file: ${{ env.CONDA_FILE }} + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.72 - name: Install x86_64-apple-darwin target if: matrix.os == 'macos-latest' run: rustup target add x86_64-apple-darwin @@ -103,6 +106,9 @@ jobs: use-mamba: true python-version: "3.9" channel-priority: strict + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.72 - name: Install dependencies and nothing else run: | pip install -e . -vv diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb2145c4f..ed68a447e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -78,11 +78,9 @@ jobs: activate-environment: dask-sql environment-file: ${{ env.CONDA_FILE }} run-post: ${{ matrix.os != 'windows-latest' && 'true' || 'false' }} - - name: Cache Rust - uses: Swatinem/rust-cache@v2 + - uses: actions-rs/toolchain@v1 with: - workspaces: dask_planner - shared-key: test + toolchain: 1.72 - name: Install x86_64-apple-darwin target if: matrix.os == 'macos-latest' run: rustup target add x86_64-apple-darwin @@ -128,6 +126,9 @@ jobs: use-mamba: true python-version: "3.9" channel-priority: strict + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.72 - name: Install dependencies and nothing else run: | pip install -e . -vv From c315329b55ec6e0271c980f2c7decc8aaa3bec95 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Mon, 13 May 2024 12:01:09 -0700 Subject: [PATCH 3/4] Revert "Bump sysroot_linux-64 to 2.17 in CI" This reverts commit c6ce8e90af07caa1d1b3b68fc9953dccbfecf3b7. --- continuous_integration/environment-3.10.yaml | 1 - continuous_integration/environment-3.11.yaml | 1 - continuous_integration/environment-3.12.yaml | 1 - continuous_integration/environment-3.9.yaml | 1 - continuous_integration/gpuci/environment-3.10.yaml | 1 - continuous_integration/gpuci/environment-3.9.yaml | 1 - 6 files changed, 6 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 8c81ae51a..6ee044f42 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - c-compiler -- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index 8dffd729c..9edaddbbd 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - c-compiler -- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index e99dca895..657e18507 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - c-compiler -- sysroot_linux-64>=2.17 - dask>=2024.4.1 - dask-expr>=1.0.11 - fastapi>=0.92.0 diff --git a/continuous_integration/environment-3.9.yaml b/continuous_integration/environment-3.9.yaml index 2809510a1..88eee32b5 100644 --- a/continuous_integration/environment-3.9.yaml +++ b/continuous_integration/environment-3.9.yaml @@ -3,7 +3,6 @@ channels: - conda-forge dependencies: - c-compiler -- sysroot_linux-64=2.17 - dask=2024.4.1 - dask-expr=1.0.11 - fastapi=0.92.0 diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index b0d222608..2371144e7 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -8,7 +8,6 @@ channels: - nodefaults dependencies: - c-compiler -- sysroot_linux-64>=2.17 - zlib - dask>=2024.4.1 - dask-expr>=1.0.11 diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml index 0f420dc8c..cb54b2ac7 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -8,7 +8,6 @@ channels: - nodefaults dependencies: - c-compiler -- sysroot_linux-64>=2.17 - zlib - dask>=2024.4.1 - dask-expr>=1.0.11 From 2c7972f62ebff7d1f29c27899b0c3ead49e0b221 Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Mon, 13 May 2024 12:41:13 -0700 Subject: [PATCH 4/4] Make sure 1.72 is used by default --- .github/workflows/rust.yml | 2 ++ .github/workflows/test-upstream.yml | 2 ++ .github/workflows/test.yml | 2 ++ docs/environment.yml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1182ce72e..d31a0012a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -41,6 +41,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Cache Cargo uses: actions/cache@v3 with: @@ -69,6 +70,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Cache Cargo uses: actions/cache@v3 with: diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml index c47060f87..21eeb9dca 100644 --- a/.github/workflows/test-upstream.yml +++ b/.github/workflows/test-upstream.yml @@ -59,6 +59,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Install x86_64-apple-darwin target if: matrix.os == 'macos-latest' run: rustup target add x86_64-apple-darwin @@ -109,6 +110,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Install dependencies and nothing else run: | pip install -e . -vv diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed68a447e..33de1e96a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -81,6 +81,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Install x86_64-apple-darwin target if: matrix.os == 'macos-latest' run: rustup target add x86_64-apple-darwin @@ -129,6 +130,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.72 + default: true - name: Install dependencies and nothing else run: | pip install -e . -vv diff --git a/docs/environment.yml b/docs/environment.yml index 601337b4c..afdd0f9f1 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -19,4 +19,4 @@ dependencies: - pygments>=2.7.1 - tabulate - ucx-proc=*=cpu - - rust>=1.72 + - rust=1.72