test: run against ibis 1.x and 2.x

Author: tswast

.github/workflows/main.yml

@@ -2,9 +2,9 @@ name: Main
 
 on:
   push:
-    branches: v1
+    branches: main
   pull_request:
-    branches: v1
+    branches: main
   schedule:
     - cron: 0 3 * * *
 
@@ -53,6 +53,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        python_version: ["3.7", "3.8", "3.9"]
+        ibis_version: ["github"]
         include:
           - python_version: "3.7"
             "ibis_version": "1.2.0"
@@ -61,7 +63,7 @@ jobs:
           - python_version: "3.9"
             "ibis_version": "1.4.0"
           - python_version: "3.10"
-            "ibis_version": "1.4.0"
+            "ibis_version": "2.0.0"
 
     steps:
 

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

@@ -17,13 +17,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
+        python_version: ["3.7", "3.10"]
+        ibis_version: ["github"]
           - python_version: "3.7"
             "ibis_version": "1.2.0"
           - python_version: "3.8"
             "ibis_version":  "1.3.0"
-          - python_version: "3.10"
+          - python_version: "3.9"
             "ibis_version": "1.4.0"
+          - python_version: "3.10"
+            "ibis_version": "2.0.0"
 
     steps:
     - name: checkout

.github/workflows/system-tests.yml

@@ -2,8 +2,7 @@ name: System Tests
 
 on:
   push:
-    branches:
-      - v1
+    branches: main
   schedule:
     - cron: 0 2 * * *
 
@@ -16,13 +15,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        python_version: ["3.7", "3.10"]
         ibis_version: ["github"]
           - python_version: "3.7"
             "ibis_version": "1.2.0"
           - python_version: "3.8"
             "ibis_version":  "1.3.0"
-          - python_version: "3.10"
+          - python_version: "3.9"
             "ibis_version": "1.4.0"
+          - python_version: "3.10"
+            "ibis_version": "2.0.0"
 
     steps:
     - name: checkout

setup.py

@@ -41,14 +41,11 @@
     packages=setuptools.find_packages(),
     python_requires=">=3.7",
     install_requires=[
-        "ibis-framework >=1.2.0,<2.0.0dev",
+        "ibis-framework >=1.2.0,<3.0.0dev",
         "google-cloud-bigquery >=1.12.0,<3.0.0dev",
         "google-cloud-bigquery-storage >=1.0.0,<3.0.0dev",
         "pyarrow >=1.0.0,<5.0.0dev",
         "pydata-google-auth",
-        # Workaround for ibis 1.x incompatibility with SQLAlchemy 1.4
-        # AttributeError: module 'sqlalchemy' has no attribute 'Binary'
-        "sqlalchemy <1.4.0dev",
     ],
     classifiers=[
         release_status,