refactor: fix mypy (#16)

Author: tswast

ibis_bigquery/client.py

@@ -360,12 +360,11 @@ def parse_project_and_dataset(
     None
 
     """
-    try:
-        data_project, dataset = dataset.split('.')
-    except (ValueError, AttributeError):
-        billing_project = data_project = project
-    else:
+    if dataset is not None and "." in dataset:
+        data_project, dataset = dataset.split(".")
         billing_project = project
+    else:
+        billing_project = data_project = project
 
     return data_project, billing_project, dataset
 

ibis_bigquery/udf/__init__.py

@@ -2,6 +2,7 @@
 import functools
 import inspect
 import itertools
+from typing import Dict, Iterable
 
 import ibis.expr.datatypes as dt
 import ibis.expr.rules as rlz
@@ -15,7 +16,7 @@
 
 __all__ = ('udf',)
 
-_udf_name_cache = collections.defaultdict(itertools.count)
+_udf_name_cache : Dict[str, Iterable[int]] = collections.defaultdict(itertools.count)
 
 
 def create_udf_node(name, fields):

tests/udf/test_core.py

@@ -7,13 +7,6 @@
 
 from ibis_bigquery.udf.core import PythonToJavaScriptTranslator, SymbolTable
 
-if PY38:
-    # ref: https://github.com/ibis-project/ibis/issues/2098
-    # note: UDF is already skipt on CI
-    pytestmark = [pytest.mark.bigquery, pytest.mark.udf]
-else:
-    pytestmark = pytest.mark.bigquery
-
 
 def test_symbol_table():
     symbols = SymbolTable()

tests/udf/test_find.py

@@ -6,13 +6,6 @@
 
 from ibis_bigquery.udf.find import find_names
 
-if PY38:
-    # ref: https://github.com/ibis-project/ibis/issues/2098
-    # note: UDF is already skipt on CI
-    pytestmark = [pytest.mark.bigquery, pytest.mark.udf]
-else:
-    pytestmark = pytest.mark.bigquery
-
 
 def parse_expr(expr):
     body = parse_stmt(expr)

tests/udf/test_udf_execute.py

@@ -11,14 +11,6 @@
 import ibis_bigquery
 from ibis_bigquery import udf  # noqa: E402
 
-if PY38:
-    # ref: https://github.com/ibis-project/ibis/issues/2098
-    # note: UDF is already skipt on CI
-    pytestmark = [pytest.mark.bigquery, pytest.mark.udf]
-else:
-    pytestmark = pytest.mark.bigquery
-
-
 PROJECT_ID = os.environ.get('GOOGLE_BIGQUERY_PROJECT_ID', 'ibis-gbq')
 DATASET_ID = 'testing'
 

tests/unit/test_client.py

@@ -0,0 +1,20 @@
+import pytest
+
+import ibis_bigquery.client
+
+
+@pytest.mark.parametrize(
+    ["project", "dataset", "expected"],
+    [
+        ("my-project", None, ("my-project", "my-project", None)),
+        ("my-project", "my_dataset", ("my-project", "my-project", "my_dataset")),
+        (
+            "billing-project",
+            "data-project.my_dataset",
+            ("data-project", "billing-project", "my_dataset"),
+        ),
+    ]
+)
+def test_parse_project_and_dataset(project, dataset, expected):
+    got = ibis_bigquery.client.parse_project_and_dataset(project, dataset)
+    assert got == expected