Skip to content

Commit

Permalink
Add conda-forge compiler pinnings to nightly recipe (#1266)
Browse files Browse the repository at this point in the history
* Add some conda-forge compiler pinnings to recipe

* Drop zlib build dep, add xz pinning for linux-64

* Drop required rust version to 1.72

* linting
  • Loading branch information
charlesbluca authored Nov 14, 2023
1 parent e04b077 commit 76c2b46
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
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.73"
rust-version = "1.72"
include = ["/src", "/dask_sql", "/LICENSE.txt", "pyproject.toml", "Cargo.toml", "Cargo.lock"]

[dependencies]
Expand Down
12 changes: 10 additions & 2 deletions continuous_integration/recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
rust_compiler:
- rust
rust_compiler_version:
- 1.73
- '1.72'
maturin:
- 1.3
- '1.3'
xz: # [linux64]
- '5' # [linux64]
1 change: 0 additions & 1 deletion continuous_integration/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ requirements:
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- maturin # [build_platform != target_platform]
- zlib
- {{ compiler('c') }}
- {{ compiler('rust') }}
host:
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ dependencies:
- pygments>=2.7.1
- tabulate
- ucx-proc=*=cpu
- rust>=1.73.0
- rust>=1.72

0 comments on commit 76c2b46

Please sign in to comment.