From 25fc69e11429bbb45f992a5db7bfb4e8615eb34b Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Tue, 26 Apr 2022 15:00:07 -0500
Subject: [PATCH] deps: support ibis 3.0 (#124)

* deps: support ibis 3.0

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

deps: support google-cloud-bigquery 3.0
---
 .github/workflows/main.yml            | 22 ++++++++++++--------
 .github/workflows/system-tests-pr.yml | 29 ++++++++++++++++-----------
 .github/workflows/system-tests.yml    | 16 ++++++++++-----
 setup.py                              |  7 ++++---
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6842a4d..29b913a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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: |
@@ -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 }}
 
diff --git a/.github/workflows/system-tests-pr.yml b/.github/workflows/system-tests-pr.yml
index 5bfd657..16ae71f 100644
--- a/.github/workflows/system-tests-pr.yml
+++ b/.github/workflows/system-tests-pr.yml
@@ -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
@@ -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
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 105fd9d..d922760 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -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
diff --git a/setup.py b/setup.py
index 2149172..5199d3f 100644
--- a/setup.py
+++ b/setup.py
@@ -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=[