Skip to content

Commit

Permalink
ci(deps): remove dep caching and pipx usage in favor of plain pip (#8956
Browse files Browse the repository at this point in the history
)
  • Loading branch information
cpcloud authored Apr 13, 2024
1 parent f8370b1 commit 9f47670
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
Expand All @@ -41,6 +38,9 @@ jobs:
cache: pip
cache-dependency-path: requirements-dev.txt

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: update apt-get
run: sudo apt-get update -y -q

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ jobs:
labels: ci-run-cloud
github_token: ${{ steps.generate_token.outputs.token }}

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install ibis
run: poetry install --without dev --without docs --extras "${{ join(matrix.backend.extras, ' ') }}"

Expand Down
31 changes: 21 additions & 10 deletions .github/workflows/ibis-backends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install ibis
run: poetry install --without dev --without docs --extras bigquery

Expand Down Expand Up @@ -123,10 +123,6 @@ jobs:
extras:
- clickhouse
- examples
- name: dask
title: Dask
extras:
- dask
- name: pandas
title: Pandas
extras:
Expand Down Expand Up @@ -237,6 +233,21 @@ jobs:
- "'apache-flink < 1.20.0'"
services:
- flink
include:
- os: ubuntu-latest
python-version: "3.11.8"
backend:
name: dask
title: Dask
extras:
- dask
- os: ubuntu-latest
python-version: "3.9"
backend:
name: dask
title: Dask
extras:
- dask
exclude:
- os: windows-latest
backend:
Expand Down Expand Up @@ -389,15 +400,15 @@ jobs:
if: matrix.backend.services != null
run: docker compose up --wait ${{ join(matrix.backend.services, ' ') }}

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install ibis
run: poetry install --without dev --without docs --extras "${{ join(matrix.backend.extras, ' ') }}"

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ibis-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: "3.11"
cache: poetry

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install system dependencies
run: sudo apt-get install -qq -y build-essential libgeos-dev freetds-dev unixodbc-dev
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/ibis-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: ${{ matrix.python-version }}

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install ${{ matrix.os }} system dependencies
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down Expand Up @@ -105,15 +105,15 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: "3.12"

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install system dependencies
run: |
set -euo pipefail
Expand Down Expand Up @@ -144,15 +144,14 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: install poetry
run: pipx install 'poetry==1.8.2'

- name: install python
uses: actions/setup-python@v5
id: install_python
with:
python-version: "3.12"
cache: poetry

- name: install poetry
run: pip install 'poetry==1.8.2'

- name: install ibis with all extras
run: poetry install --without dev --without docs --all-extras
Expand Down

0 comments on commit 9f47670

Please sign in to comment.