Skip to content

Commit 32604e3

Browse files
committed
Working through CI changes to use uv instead of pip and conda
1 parent 88aff7e commit 32604e3

File tree

3 files changed

+31
-47
lines changed

3 files changed

+31
-47
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ jobs:
3131
- name: Install Python
3232
uses: actions/setup-python@v5
3333
with:
34-
python-version: "3.11"
34+
python-version: "3.12"
3535
- name: Install dependencies
3636
run: |
37-
python -m pip install --upgrade pip
38-
pip install ruff
37+
python -m pip install uv
38+
uv venv
39+
source .venv/bin/activate
40+
uv sync
3941
# Update output format to enable automatic inline annotations.
4042
- name: Run Ruff
4143
run: |
@@ -78,12 +80,6 @@ jobs:
7880
with:
7981
toolchain: stable
8082

81-
- name: Upgrade pip
82-
run: python -m pip install --upgrade pip
83-
84-
- name: Install maturin
85-
run: pip install maturin==1.5.1
86-
8783
- run: rm LICENSE.txt
8884
- name: Download LICENSE.txt
8985
uses: actions/download-artifact@v4
@@ -97,6 +93,13 @@ jobs:
9793
version: "27.4"
9894
repo-token: ${{ secrets.GITHUB_TOKEN }}
9995

96+
- name: Install dependencies and build
97+
run: |
98+
python -m pip install uv
99+
uv venv
100+
source .venv/bin/activate
101+
uv sync
102+
100103
- name: Build Python package
101104
run: maturin build --release --strip --features substrait
102105

@@ -136,12 +139,6 @@ jobs:
136139
with:
137140
toolchain: stable
138141

139-
- name: Upgrade pip
140-
run: python -m pip install --upgrade pip
141-
142-
- name: Install maturin
143-
run: pip install maturin==1.5.1
144-
145142
- run: rm LICENSE.txt
146143
- name: Download LICENSE.txt
147144
uses: actions/download-artifact@v4
@@ -155,6 +152,13 @@ jobs:
155152
version: "27.4"
156153
repo-token: ${{ secrets.GITHUB_TOKEN }}
157154

155+
- name: Install dependencies and build
156+
run: |
157+
python -m pip install uv
158+
uv venv
159+
source .venv/bin/activate
160+
uv sync
161+
158162
- name: Build Python package
159163
run: |
160164
maturin build --release --strip --features substrait

.github/workflows/docs.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,12 @@ jobs:
5757
version: '27.4'
5858
repo-token: ${{ secrets.GITHUB_TOKEN }}
5959

60-
- name: Install dependencies
61-
run: |
62-
set -x
63-
python3 -m venv venv
64-
source venv/bin/activate
65-
pip install -r requirements-311.txt
66-
pip install -r docs/requirements.txt
67-
- name: Build Datafusion
68-
run: |
69-
set -x
70-
source venv/bin/activate
71-
maturin develop
60+
- name: Install dependencies and build
61+
run: |
62+
python -m pip install uv
63+
uv venv
64+
source .venv/bin/activate
65+
uv sync --dev
7266
7367
- name: Build docs
7468
run: |

.github/workflows/test.yaml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,26 +80,12 @@ jobs:
8080
command: clippy
8181
args: --all-targets --all-features -- -D clippy::all -A clippy::redundant_closure
8282

83-
- name: Create Virtualenv (3.12)
84-
if: ${{ matrix.python-version == '3.12' }}
85-
run: |
86-
python -m venv venv
87-
source venv/bin/activate
88-
pip install -r requirements-312.txt
89-
90-
- name: Create Virtualenv (3.10)
91-
if: ${{ matrix.python-version == '3.10' }}
92-
run: |
93-
python -m venv venv
94-
source venv/bin/activate
95-
pip install -r requirements-310.txt
96-
97-
- name: Create Virtualenv (3.11)
98-
if: ${{ matrix.python-version == '3.11' }}
99-
run: |
100-
python -m venv venv
101-
source venv/bin/activate
102-
pip install -r requirements-311.txt
83+
- name: Install dependencies and build
84+
run: |
85+
python -m pip install uv
86+
uv venv
87+
source .venv/bin/activate
88+
uv sync --dev
10389
10490
- name: Run tests
10591
env:

0 commit comments

Comments
 (0)