Skip to content

Commit 06c3120

Browse files
authored
refactor: remove circular dependencies preventing local doctest runs (#987)
With this change I can once again run ``` pytest --doctest-modules third_party/bigframes_vendored/pandas/core/frame.py ``` Note: having multiple `version.py` files should be fine. release-please will update all such files it finds.
1 parent 0f047b4 commit 06c3120

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+77
-64
lines changed

bigframes/bigquery/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import typing
2424
from typing import Literal, Optional, Union
2525

26-
import bigframes.constants as constants
26+
import bigframes_vendored.constants as constants
27+
2728
import bigframes.core.groupby as groupby
2829
import bigframes.core.sql
2930
import bigframes.ml.utils as utils

bigframes/constants.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919

2020
import datetime
2121

22-
import bigframes_vendored.constants
23-
24-
BF_VERSION = bigframes_vendored.constants.BF_VERSION
25-
FEEDBACK_LINK = bigframes_vendored.constants.FEEDBACK_LINK
26-
ABSTRACT_METHOD_ERROR_MESSAGE = (
27-
bigframes_vendored.constants.ABSTRACT_METHOD_ERROR_MESSAGE
28-
)
29-
3022
DEFAULT_EXPIRATION = datetime.timedelta(days=7)
3123

3224
# https://cloud.google.com/bigquery/docs/locations

bigframes/core/block_transforms.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
import typing
1818
from typing import Sequence
1919

20+
import bigframes_vendored.constants as constants
2021
import pandas as pd
2122

22-
import bigframes.constants as constants
23+
import bigframes.constants
2324
import bigframes.core as core
2425
import bigframes.core.blocks as blocks
2526
import bigframes.core.expression as ex
@@ -117,7 +118,7 @@ def quantile(
117118
)
118119
quantile_cols = []
119120
labels = []
120-
if len(columns) * len(qs) > constants.MAX_COLUMNS:
121+
if len(columns) * len(qs) > bigframes.constants.MAX_COLUMNS:
121122
raise NotImplementedError("Too many aggregates requested.")
122123
for col in columns:
123124
for q in qs:

bigframes/core/blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
from typing import Iterable, List, Literal, Mapping, Optional, Sequence, Tuple, Union
3333
import warnings
3434

35+
import bigframes_vendored.constants as constants
3536
import google.cloud.bigquery as bigquery
3637
import pandas as pd
3738
import pyarrow as pa
3839

3940
import bigframes._config.sampling_options as sampling_options
4041
import bigframes.constants
41-
import bigframes.constants as constants
4242
import bigframes.core as core
4343
import bigframes.core.compile.googlesql as googlesql
4444
import bigframes.core.expression as ex

bigframes/core/compile/aggregate_compiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import typing
1616
from typing import cast, Optional
1717

18+
import bigframes_vendored.constants as constants
1819
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
1920
import ibis
2021
import ibis.expr.datatypes as ibis_dtypes
2122
import ibis.expr.types as ibis_types
2223
import pandas as pd
2324

24-
import bigframes.constants as constants
2525
import bigframes.core.compile.ibis_types as compile_ibis_types
2626
import bigframes.core.compile.scalar_op_compiler as scalar_compilers
2727
import bigframes.core.expression as ex

bigframes/core/compile/ibis_types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from typing import Any, cast, Dict, Iterable, Optional, Tuple, Union
1818
import warnings
1919

20+
import bigframes_vendored.constants as constants
2021
import bigframes_vendored.ibis.backends.bigquery.datatypes as third_party_ibis_bqtypes
2122
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
2223
import geopandas as gpd # type: ignore
@@ -29,7 +30,6 @@
2930
import pandas as pd
3031
import pyarrow as pa
3132

32-
import bigframes.constants as constants
3333
import bigframes.dtypes
3434

3535
# Type hints for Ibis data types supported by BigQuery DataFrame

bigframes/core/compile/scalar_op_compiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import functools
1818
import typing
1919

20+
import bigframes_vendored.constants as constants
2021
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
2122
import ibis
2223
import ibis.common.exceptions
@@ -26,7 +27,6 @@
2627
import numpy as np
2728
import pandas as pd
2829

29-
import bigframes.constants as constants
3030
import bigframes.core.compile.ibis_types
3131
import bigframes.core.expression as ex
3232
import bigframes.dtypes

bigframes/core/groupby/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import typing
1818
from typing import Sequence, Union
1919

20+
import bigframes_vendored.constants as constants
2021
import bigframes_vendored.pandas.core.groupby as vendored_pandas_groupby
2122
import pandas as pd
2223

23-
import bigframes.constants as constants
2424
from bigframes.core import log_adapter
2525
import bigframes.core as core
2626
import bigframes.core.block_transforms as block_ops

bigframes/core/indexers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import typing
1818
from typing import Tuple, Union
1919

20+
import bigframes_vendored.constants as constants
2021
import ibis
2122
import pandas as pd
2223

23-
import bigframes.constants as constants
2424
import bigframes.core.blocks
2525
import bigframes.core.expression as ex
2626
import bigframes.core.guid as guid

bigframes/core/indexes/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import typing
2020
from typing import Hashable, Optional, Sequence, Union
2121

22+
import bigframes_vendored.constants as constants
2223
import bigframes_vendored.pandas.core.indexes.base as vendored_pandas_index
2324
import google.cloud.bigquery as bigquery
2425
import numpy as np
2526
import pandas
2627

27-
import bigframes.constants as constants
2828
import bigframes.core.block_transforms as block_ops
2929
import bigframes.core.blocks as blocks
3030
import bigframes.core.expression as ex

0 commit comments

Comments
 (0)