diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d31a0012a..22e281f7b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,10 +38,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.72 - default: true - name: Cache Cargo uses: actions/cache@v3 with: @@ -67,10 +63,6 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.72 - default: true - name: Cache Cargo uses: actions/cache@v3 with: diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index cd83bffc3..12205abcd 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -17,6 +17,7 @@ jobs: - uses: actions/setup-python@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly - components: rustfmt + toolchain: 1.77 + components: clippy + default: true - uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml index 21eeb9dca..e2b03c87c 100644 --- a/.github/workflows/test-upstream.yml +++ b/.github/workflows/test-upstream.yml @@ -56,10 +56,6 @@ jobs: channel-priority: strict activate-environment: dask-sql environment-file: ${{ env.CONDA_FILE }} - - 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 @@ -107,10 +103,6 @@ jobs: use-mamba: true python-version: "3.9" channel-priority: strict - - 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 33de1e96a..b6924403d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,6 +68,10 @@ jobs: query-planning: false steps: - uses: actions/checkout@v4 + - name: Don't install sysroot on Windows + if: matrix.os == 'windows-latest' + run: | + sed -i '/^.*- sysroot_linux-64/s/^/#/' ${{ env.CONDA_FILE }} - name: Set up Python uses: conda-incubator/setup-miniconda@v2.3.0 with: @@ -78,10 +82,6 @@ jobs: activate-environment: dask-sql environment-file: ${{ env.CONDA_FILE }} run-post: ${{ matrix.os != 'windows-latest' && 'true' || 'false' }} - - 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 @@ -127,10 +127,6 @@ jobs: use-mamba: true python-version: "3.9" channel-priority: strict - - 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/.pre-commit-config.yaml b/.pre-commit-config.yaml index 094c4ada1..cf455ed22 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,12 +31,3 @@ repos: - id: check-yaml exclude: ^continuous_integration/recipe/ - id: check-added-large-files - - repo: local - hooks: - - id: cargo-fmt - name: cargo fmt - description: Format files with cargo fmt. - entry: cargo +nightly fmt - language: system - types: [rust] - args: ['--manifest-path', './Cargo.toml', '--verbose', '--'] diff --git a/Cargo.toml b/Cargo.toml index f362039f6..ba99bd620 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ description = "Bindings for DataFusion used by Dask-SQL" readme = "README.md" license = "Apache-2.0" edition = "2021" -rust-version = "1.72" +rust-version = "1.77" include = ["/src", "/dask_sql", "/LICENSE.txt", "pyproject.toml", "Cargo.toml", "Cargo.lock"] [dependencies] diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 6ee044f42..b1d96fe2b 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -28,9 +28,11 @@ dependencies: - pytest - python=3.10 - py-xgboost>=2.0.3 +- rust=1.77 - scikit-learn>=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 - triad<0.9.2 diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index 9edaddbbd..60dba66b5 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -28,9 +28,11 @@ dependencies: - pytest - python=3.11 - py-xgboost>=2.0.3 +- rust=1.77 - scikit-learn>=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 - triad<0.9.2 diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index 657e18507..9c9cb6e9e 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -29,9 +29,11 @@ dependencies: - pytest - python=3.12 - py-xgboost>=2.0.3 +- rust=1.77 - scikit-learn>=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 # TODO: add once tpot supports python 3.12 # - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 diff --git a/continuous_integration/environment-3.9.yaml b/continuous_integration/environment-3.9.yaml index 88eee32b5..458e3602f 100644 --- a/continuous_integration/environment-3.9.yaml +++ b/continuous_integration/environment-3.9.yaml @@ -28,9 +28,11 @@ dependencies: - pytest - python=3.9 - py-xgboost=2.0.3 +- rust=1.77 - scikit-learn=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 - triad<0.9.2 diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml index 2371144e7..cd2330551 100644 --- a/continuous_integration/gpuci/environment-3.10.yaml +++ b/continuous_integration/gpuci/environment-3.10.yaml @@ -34,9 +34,11 @@ dependencies: - pytest - python=3.10 - py-xgboost>=2.0.3 +- rust=1.77 - scikit-learn>=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 - triad<0.9.2 diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml index cb54b2ac7..4346f1262 100644 --- a/continuous_integration/gpuci/environment-3.9.yaml +++ b/continuous_integration/gpuci/environment-3.9.yaml @@ -34,9 +34,11 @@ dependencies: - pytest - python=3.9 - py-xgboost==2.0.3 +- rust=1.77 - scikit-learn>=1.0.0 - sphinx - sqlalchemy +- sysroot_linux-64>=2.17 - tpot>=0.12.0 # FIXME: https://github.com/fugue-project/fugue/issues/526 - triad<0.9.2 diff --git a/continuous_integration/recipe/conda_build_config.yaml b/continuous_integration/recipe/conda_build_config.yaml index 2a523c954..b34a40540 100644 --- a/continuous_integration/recipe/conda_build_config.yaml +++ b/continuous_integration/recipe/conda_build_config.yaml @@ -5,7 +5,7 @@ c_compiler_version: rust_compiler: - rust rust_compiler_version: - - '1.72' + - '1.77' maturin: - '1.3' xz: # [linux64] diff --git a/docs/environment.yml b/docs/environment.yml index afdd0f9f1..b4531c320 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.77