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

Commit

Permalink
deps: support ibis 3.0 (#124)
Browse files Browse the repository at this point in the history
* deps: support ibis 3.0

* test: remove label after checkout so it works in case of failure

deps: support google-cloud-bigquery 3.0
  • Loading branch information
tswast authored Apr 26, 2022
1 parent ec15188 commit 25fc69e
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 28 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
steps:

- name: checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: "3.7"
python-version: "3.10"

- name: install dependencies
run: |
Expand Down Expand Up @@ -53,27 +53,33 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ["3.7", "3.8", "3.9", "3.10"]
ibis_version: ["2.0.0"]
include:
- python_version: "3.7"
"ibis_version": "2.0.0"
- python_version: "3.8"
"ibis_version": "2.1.1"
- python_version: "3.9"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "github"

steps:

- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: ibis_bigquery

- name: checkout ibis
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ibis-project/ibis
path: ibis

- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

Expand Down
29 changes: 17 additions & 12 deletions .github/workflows/system-tests-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,38 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ["3.7", "3.8", "3.9", "3.10"]
ibis_version: ["2.0.0"]
include:
- python_version: "3.7"
"ibis_version": "2.0.0"
- python_version: "3.8"
"ibis_version": "2.1.1"
- python_version: "3.9"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "github"

steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
path: ibis_bigquery

# Remove the label so that it can be added again to re-trigger a build
- name: reset label
uses: actions-ecosystem/action-remove-labels@v1
with:
labels: run-ci

- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

- name: checkout ibis
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ibis-project/ibis
path: ibis
Expand All @@ -56,10 +68,3 @@ jobs:
run: GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest ./ibis_bigquery/tests/system --save-dataset
env:
GOOGLE_BIGQUERY_PROJECT_ID: ibis-gbq


# Remove the label so that it can be added again to re-trigger a build
- name: reset label
uses: actions-ecosystem/action-remove-labels@v1
with:
labels: run-ci
16 changes: 11 additions & 5 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,31 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ["3.7", "3.8", "3.9", "3.10"]
ibis_version: ["2.0.0"]
include:
- python_version: "3.7"
"ibis_version": "2.0.0"
- python_version: "3.8"
"ibis_version": "2.1.1"
- python_version: "3.9"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "3.0.0"
- python_version: "3.10"
"ibis_version": "github"

steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: ibis_bigquery

- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}

- name: checkout ibis
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ibis-project/ibis
path: ibis
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@
packages=setuptools.find_packages(),
python_requires=">=3.7",
install_requires=[
"ibis-framework >=2.0.0,<3.0.0dev",
"google-cloud-bigquery >=1.12.0,<3.0.0dev",
"ibis-framework >=2.0.0,<4.0.0dev",
"db-dtypes>=0.3.0,<2.0.0dev",
"google-cloud-bigquery >=1.12.0,<4.0.0dev",
"google-cloud-bigquery-storage >=1.0.0,<3.0.0dev",
"pyarrow >=1.0.0,<7.0.0dev",
"pyarrow >=1.0.0,<8.0.0dev",
"pydata-google-auth",
],
classifiers=[
Expand Down

0 comments on commit 25fc69e

Please sign in to comment.