Skip to content
This repository was archived by the owner on Mar 29, 2023. It is now read-only.

Commit e9c9535

Browse files
authored
ci: fixes to address upcoming ibis incompatibilities (#106)
* test: remove noop constructor * fix: ensure non-nested installation * ci: fixup deps * ci: remove explicit head sha as pull_request_target already runs without the merge commit
1 parent b8834ce commit e9c9535

File tree

5 files changed

+24
-12
lines changed

5 files changed

+24
-12
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
steps:
6363

6464
- name: checkout
65-
uses: actions/checkout@v1
65+
uses: actions/checkout@v2
66+
with:
67+
path: ibis_bigquery
6668

6769
- name: checkout ibis
6870
uses: actions/checkout@v2
@@ -78,7 +80,7 @@ jobs:
7880
- name: install dependencies (ibis ${{ matrix.ibis_version }})
7981
env:
8082
IBIS_VERSION: ${{ matrix.ibis_version }}
81-
run: ./ci/install_deps.sh
83+
run: ./ibis_bigquery/ci/install_deps.sh
8284

8385
- name: run tests
84-
run: python -m pytest tests/unit
86+
run: python -m pytest ./ibis_bigquery/tests/unit

.github/workflows/system-tests-pr.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: checkout
2828
uses: actions/checkout@v2
2929
with:
30-
ref: ${{ github.event.pull_request.head.sha }}
30+
path: ibis_bigquery
3131

3232
- name: set up python ${{ matrix.python-version }}
3333
uses: actions/setup-python@v2
@@ -43,15 +43,20 @@ jobs:
4343
- name: install dependencies (ibis ${{ matrix.ibis_version }})
4444
env:
4545
IBIS_VERSION: ${{ matrix.ibis_version }}
46-
run: ./ci/install_deps.sh
46+
run: ./ibis_bigquery/ci/install_deps.sh
4747

4848
- name: set up bigquery credentials
49+
working-directory: ibis_bigquery
4950
run: ./ci/decrypt_secret.sh
5051
env:
5152
GCLOUD_KEY_PASSPHRASE: ${{ secrets.GCLOUD_KEY_PASSPHRASE }}
5253

5354
- name: run tests
54-
run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system --save-dataset
55+
run: python -m pytest ./ibis_bigquery/tests/system --save-dataset
56+
env:
57+
GOOGLE_BIGQUERY_PROJECT_ID: ibis-gbq
58+
GOOGLE_APPLICATION_CREDENTIALS: ${{ env.HOME }}/secrets/gcloud-service-key.json
59+
5560

5661
# Remove the label so that it can be added again to re-trigger a build
5762
- name: reset label

.github/workflows/system-tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
steps:
2525
- name: checkout
2626
uses: actions/checkout@v2
27+
with:
28+
path: ibis_bigquery
2729

2830
- name: set up python ${{ matrix.python-version }}
2931
uses: actions/setup-python@v2
@@ -39,12 +41,16 @@ jobs:
3941
- name: install dependencies (ibis ${{ matrix.ibis_version }})
4042
env:
4143
IBIS_VERSION: ${{ matrix.ibis_version }}
42-
run: ./ci/install_deps.sh
44+
run: ./ibis_bigquery/ci/install_deps.sh
4345

4446
- name: set up bigquery credentials
47+
working-directory: ibis_bigquery
4548
run: ./ci/decrypt_secret.sh
4649
env:
4750
GCLOUD_KEY_PASSPHRASE: ${{ secrets.GCLOUD_KEY_PASSPHRASE }}
4851

4952
- name: run tests
50-
run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system --save-dataset
53+
run: python -m pytest ./ibis_bigquery/tests/system --save-dataset
54+
env:
55+
GOOGLE_BIGQUERY_PROJECT_ID: ibis-gbq
56+
GOOGLE_APPLICATION_CREDENTIALS: ${{ env.HOME }}/secrets/gcloud-service-key.json

ci/install_deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import sys
1313
site.ENABLE_USER_SITE = '--user' in sys.argv[1:]
1414
$(cat ./ibis/setup.py)" > ./ibis/setup.py
1515

16-
python -m pip install --user -e ./ibis
16+
python -m pip install --user ./ibis
1717
else
1818
python -m pip install --user ibis-framework=="$IBIS_VERSION"
1919
fi
2020

21-
python -m pip install --user -e .
21+
python -m pip install --user ./ibis_bigquery
2222
python -m pip install --user pytest

tests/unit/test_compiler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@ def test_large_compile():
318318
num_joins = 7
319319

320320
class MockBackend(ibis_bigquery.Backend):
321-
def __init__(self):
322-
pass
321+
pass
323322

324323
names = [f"col_{i}" for i in range(num_columns)]
325324
schema = ibis.Schema(names, ["string"] * num_columns)

0 commit comments

Comments
 (0)