Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to pinned conda Rust dependency #1334

8 changes: 0 additions & 8 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
8 changes: 0 additions & 8 deletions .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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', '--']
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/environment-3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/environment-3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/environment-3.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/environment-3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/gpuci/environment-3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions continuous_integration/gpuci/environment-3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
rust_compiler:
- rust
rust_compiler_version:
- '1.72'
- '1.77'
maturin:
- '1.3'
xz: # [linux64]
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
- pygments>=2.7.1
- tabulate
- ucx-proc=*=cpu
- rust=1.72
- rust=1.77
Loading