Merge pull request #96 from ibis-project/sync-v1

chore: sync main with v1 branch

Author: tswast

.github/workflows/main.yml

@@ -58,10 +58,12 @@ jobs:
         include:
           - python_version: "3.7"
             "ibis_version": "1.2.0"
-          - python_version: "3.7"
-            "ibis_version":  "1.3.0"
           - python_version: "3.8"
+            "ibis_version":  "1.3.0"
+          - python_version: "3.9"
             "ibis_version": "1.4.0"
+          - python_version: "3.10"
+            "ibis_version": "2.0.0"
 
     steps:
 

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

@@ -17,15 +17,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: ["3.7", "3.8", "3.9"]
+        python_version: ["3.7", "3.10"]
         ibis_version: ["github"]
-        include:
           - python_version: "3.7"
             "ibis_version": "1.2.0"
-          - python_version: "3.7"
-            "ibis_version":  "1.3.0"
           - python_version: "3.8"
+            "ibis_version":  "1.3.0"
+          - python_version: "3.9"
             "ibis_version": "1.4.0"
+          - python_version: "3.10"
+            "ibis_version": "2.0.0"
 
     steps:
     - name: checkout
@@ -55,7 +56,7 @@ jobs:
         GCLOUD_KEY_PASSPHRASE: ${{ secrets.GCLOUD_KEY_PASSPHRASE }}
 
     - name: run tests
-      run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system
+      run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system --save-dataset
 
     # Remove the label so that it can be added again to re-trigger a build
     - name: reset label

.github/workflows/system-tests.yml

@@ -15,15 +15,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: ["3.7", "3.8", "3.9"]
+        python_version: ["3.7", "3.10"]
         ibis_version: ["github"]
-        include:
           - python_version: "3.7"
             "ibis_version": "1.2.0"
-          - python_version: "3.7"
-            "ibis_version":  "1.3.0"
           - python_version: "3.8"
+            "ibis_version":  "1.3.0"
+          - python_version: "3.9"
             "ibis_version": "1.4.0"
+          - python_version: "3.10"
+            "ibis_version": "2.0.0"
 
     steps:
     - name: checkout
@@ -51,4 +52,4 @@ jobs:
         GCLOUD_KEY_PASSPHRASE: ${{ secrets.GCLOUD_KEY_PASSPHRASE }}
 
     - name: run tests
-      run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system
+      run: GOOGLE_BIGQUERY_PROJECT_ID="ibis-gbq" GOOGLE_APPLICATION_CREDENTIALS="$HOME/secrets/gcloud-service-key.json" python -m pytest tests/system --save-dataset

environment.yml

@@ -1,13 +1,13 @@
-name: ibis-bigquery-dev
+name: ibis-v1-bigquery-dev
 channels:
 - conda-forge
 dependencies:
 
 # core
-- ibis-framework  # TODO: require Ibis 2.0 when it's released
-- cached_property  # New in Ibis 2.0 https://github.com/ibis-project/ibis/pull/2805
+- ibis-framework <=2.0.0dev
 - google-cloud-bigquery-core >=1.12.0,<3.0.0dev
 - pydata-google-auth
+- sqlalchemy=1.3.23
 
 # dev
 - black=19.10b0 # Same as ibis

ibis_bigquery/compiler.py

@@ -291,7 +291,7 @@ def _string_substring(translator, expr):
         raise ValueError("Length parameter should not be a negative value.")
 
     base_substring = operation_registry[ops.Substring]
-    base_substring(translator, expr)
+    return base_substring(translator, expr)
 
 
 def _array_literal_format(expr):

setup.py

@@ -41,8 +41,7 @@
     packages=setuptools.find_packages(),
     python_requires=">=3.7",
     install_requires=[
-        # TODO require ibis 2.0 when it's released
-        "ibis-framework >= 1.2.0,<3.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",