Skip to content

Commit

Permalink
Working through CI changes to use uv instead of pip and conda
Browse files Browse the repository at this point in the history
  • Loading branch information
timsaucer committed Jan 12, 2025
1 parent 88aff7e commit 32604e3
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 47 deletions.
34 changes: 19 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ jobs:
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ruff
python -m pip install uv
uv venv
source .venv/bin/activate
uv sync
# Update output format to enable automatic inline annotations.
- name: Run Ruff
run: |
Expand Down Expand Up @@ -78,12 +80,6 @@ jobs:
with:
toolchain: stable

- name: Upgrade pip
run: python -m pip install --upgrade pip

- name: Install maturin
run: pip install maturin==1.5.1

- run: rm LICENSE.txt
- name: Download LICENSE.txt
uses: actions/download-artifact@v4
Expand All @@ -97,6 +93,13 @@ jobs:
version: "27.4"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies and build
run: |
python -m pip install uv
uv venv
source .venv/bin/activate
uv sync
- name: Build Python package
run: maturin build --release --strip --features substrait

Expand Down Expand Up @@ -136,12 +139,6 @@ jobs:
with:
toolchain: stable

- name: Upgrade pip
run: python -m pip install --upgrade pip

- name: Install maturin
run: pip install maturin==1.5.1

- run: rm LICENSE.txt
- name: Download LICENSE.txt
uses: actions/download-artifact@v4
Expand All @@ -155,6 +152,13 @@ jobs:
version: "27.4"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies and build
run: |
python -m pip install uv
uv venv
source .venv/bin/activate
uv sync
- name: Build Python package
run: |
maturin build --release --strip --features substrait
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,12 @@ jobs:
version: '27.4'
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Install dependencies
run: |
set -x
python3 -m venv venv
source venv/bin/activate
pip install -r requirements-311.txt
pip install -r docs/requirements.txt
- name: Build Datafusion
run: |
set -x
source venv/bin/activate
maturin develop
- name: Install dependencies and build
run: |
python -m pip install uv
uv venv
source .venv/bin/activate
uv sync --dev
- name: Build docs
run: |
Expand Down
26 changes: 6 additions & 20 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,12 @@ jobs:
command: clippy
args: --all-targets --all-features -- -D clippy::all -A clippy::redundant_closure

- name: Create Virtualenv (3.12)
if: ${{ matrix.python-version == '3.12' }}
run: |
python -m venv venv
source venv/bin/activate
pip install -r requirements-312.txt
- name: Create Virtualenv (3.10)
if: ${{ matrix.python-version == '3.10' }}
run: |
python -m venv venv
source venv/bin/activate
pip install -r requirements-310.txt
- name: Create Virtualenv (3.11)
if: ${{ matrix.python-version == '3.11' }}
run: |
python -m venv venv
source venv/bin/activate
pip install -r requirements-311.txt
- name: Install dependencies and build
run: |
python -m pip install uv
uv venv
source .venv/bin/activate
uv sync --dev
- name: Run tests
env:
Expand Down

0 comments on commit 32604e3

Please sign in to comment.