Skip to content

Commit 1281790

Browse files
authored
fix(google-cloud-bigquery): include pyopenssl as a dependency (#17345)
This seems to be required when I do a fresh Python 3.14 install. Also, - updates the pandas tests to relax data type assertions on timestamp/datetime. See internal issue b/516834095#comment8 🦕
1 parent 01dbac5 commit 1281790

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

packages/google-cloud-bigquery/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ classifiers = [
4242
]
4343
dependencies = [
4444
"google-api-core[grpc] >= 2.11.1, < 3.0.0",
45-
"google-auth >= 2.14.1, < 3.0.0",
45+
"google-auth[pyopenssl] >= 2.14.1, < 3.0.0",
4646
"google-cloud-core >= 2.4.1, < 3.0.0",
4747
"google-resumable-media >= 2.0.0, < 3.0.0",
4848
"packaging >= 24.2.0",

packages/google-cloud-bigquery/tests/system/test_pandas.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import collections
1818
import datetime
1919
import decimal
20-
import json
2120
import io
21+
import json
2222
import operator
2323
import warnings
2424

@@ -31,12 +31,10 @@
3131
import importlib_metadata as metadata
3232

3333
from google.cloud import bigquery
34-
3534
from google.cloud.bigquery import enums
3635

3736
from . import helpers
3837

39-
4038
pandas = pytest.importorskip("pandas", minversion="0.23.0")
4139
pyarrow = pytest.importorskip("pyarrow")
4240
numpy = pytest.importorskip("numpy")
@@ -957,8 +955,7 @@ def get_rows():
957955

958956

959957
def test_nested_table_to_dataframe(bigquery_client, dataset_id):
960-
from google.cloud.bigquery.job import SourceFormat
961-
from google.cloud.bigquery.job import WriteDisposition
958+
from google.cloud.bigquery.job import SourceFormat, WriteDisposition
962959

963960
SF = bigquery.SchemaField
964961
schema = [
@@ -1085,10 +1082,13 @@ def test_list_rows_nullable_scalars_dtypes(bigquery_client, scalars_table, max_r
10851082
).to_dataframe()
10861083

10871084
assert df.dtypes["bool_col"].name == "boolean"
1088-
assert df.dtypes["datetime_col"].name == "datetime64[ns]"
1085+
assert df.dtypes["datetime_col"].name in ("datetime64[us]", "datetime64[ns]")
10891086
assert df.dtypes["float64_col"].name == "float64"
10901087
assert df.dtypes["int64_col"].name == "Int64"
1091-
assert df.dtypes["timestamp_col"].name == "datetime64[ns, UTC]"
1088+
assert df.dtypes["timestamp_col"].name in (
1089+
"datetime64[us, UTC]",
1090+
"datetime64[ns, UTC]",
1091+
)
10921092
assert df.dtypes["date_col"].name == "dbdate"
10931093
assert df.dtypes["time_col"].name == "dbtime"
10941094

@@ -1389,8 +1389,8 @@ def test_to_geodataframe(bigquery_client, dataset_id):
13891389
def test_load_geodataframe(bigquery_client, dataset_id):
13901390
geopandas = pytest.importorskip("geopandas")
13911391
import pandas
1392-
from shapely import wkt
13931392
from google.cloud.bigquery.schema import SchemaField
1393+
from shapely import wkt
13941394

13951395
df = geopandas.GeoDataFrame(
13961396
pandas.DataFrame(
@@ -1450,8 +1450,8 @@ def test_load_dataframe_w_shapely(bigquery_client, dataset_id):
14501450

14511451
def test_load_dataframe_w_wkb(bigquery_client, dataset_id):
14521452
wkt = pytest.importorskip("shapely.wkt")
1453-
from shapely import wkb
14541453
from google.cloud.bigquery.schema import SchemaField
1454+
from shapely import wkb
14551455

14561456
df = pandas.DataFrame(
14571457
dict(name=["foo", "bar"], geo=[None, wkb.dumps(wkt.loads("Point(1 1)"))])

packages/google-cloud-bigquery/tests/unit/test_magics.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,20 @@
1414

1515
import copy
1616
import re
17+
import warnings
1718
from concurrent import futures
1819
from unittest import mock
19-
import warnings
2020

21-
from google.api_core import exceptions
2221
import google.auth.credentials
2322
import pytest
24-
from tests.unit.helpers import make_connection
25-
from test_utils.imports import maybe_fail_import
26-
23+
from google.api_core import exceptions
2724
from google.cloud import bigquery
2825
from google.cloud.bigquery import exceptions as bq_exceptions
29-
from google.cloud.bigquery import job
30-
from google.cloud.bigquery import table
26+
from google.cloud.bigquery import job, table
3127
from google.cloud.bigquery.retry import DEFAULT_TIMEOUT
28+
from test_utils.imports import maybe_fail_import
3229

30+
from tests.unit.helpers import make_connection
3331

3432
try:
3533
from google.cloud.bigquery.magics import magics
@@ -2138,6 +2136,7 @@ def test_bigquery_magic_w_destination_table(monkeypatch):
21382136
magics.context.credentials = mock.create_autospec(
21392137
google.auth.credentials.Credentials, instance=True
21402138
)
2139+
magics.context._project = "test-project"
21412140

21422141
create_dataset_if_necessary_patch = mock.patch(
21432142
"google.cloud.bigquery.magics.magics._create_dataset_if_necessary",
@@ -2171,6 +2170,7 @@ def test_bigquery_magic_create_dataset_fails(monkeypatch):
21712170
magics.context.credentials = mock.create_autospec(
21722171
google.auth.credentials.Credentials, instance=True
21732172
)
2173+
magics.context._project = "test-project"
21742174

21752175
create_dataset_if_necessary_patch = mock.patch(
21762176
"google.cloud.bigquery.magics.magics._create_dataset_if_necessary",

0 commit comments

Comments
 (0)