Skip to content

Commit 763edeb

Browse files
authored
fix: move third_party.bigframes_vendored to bigframes_vendored (#424)
This will avoid potential conflicts when run from a location that contains the commonly named `third_party` directory. Note: I followed the instructions here: https://stackoverflow.com/a/17179022/101923 but I also had to add a `pyproject.toml` file to support editable installations (see: https://togithub.com/pypa/setuptools/issues/230#issuecomment-1473278299). Fixes internal issue 328781348. 🦕
1 parent 4aadff4 commit 763edeb

Some content is hidden

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

57 files changed

+152
-138
lines changed

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# Generated by synthtool. DO NOT EDIT!
1818
include README.rst LICENSE
19-
recursive-include third_party *
19+
recursive-include third_party/bigframes_vendored *
2020
recursive-include bigframes *.json *.proto py.typed
2121
recursive-include tests *
2222
global-exclude *.py[co]

‎bigframes/_config/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
DataFrames from this package.
1818
"""
1919

20+
import bigframes_vendored.pandas._config.config as pandas_config
21+
2022
import bigframes._config.bigquery_options as bigquery_options
2123
import bigframes._config.compute_options as compute_options
2224
import bigframes._config.display_options as display_options
2325
import bigframes._config.sampling_options as sampling_options
24-
import third_party.bigframes_vendored.pandas._config.config as pandas_config
2526

2627

2728
class Options:

‎bigframes/_config/display_options.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
import dataclasses
1919
from typing import Literal, Optional
2020

21+
import bigframes_vendored.pandas.core.config_init as vendored_pandas_config
2122
import pandas as pd
2223

23-
import third_party.bigframes_vendored.pandas.core.config_init as vendored_pandas_config
24-
2524

2625
@dataclasses.dataclass
2726
class DisplayOptions:

‎bigframes/_config/sampling_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import dataclasses
2020
from typing import Literal, Optional
2121

22-
import third_party.bigframes_vendored.pandas.core.config_init as vendored_pandas_config
22+
import bigframes_vendored.pandas.core.config_init as vendored_pandas_config
2323

2424

2525
@dataclasses.dataclass

‎bigframes/core/blocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from typing import Iterable, List, Mapping, Optional, Sequence, Tuple
3030
import warnings
3131

32+
import bigframes_vendored.pandas.io.common as vendored_pandas_io_common
3233
import google.cloud.bigquery as bigquery
3334
import pandas as pd
3435

@@ -45,7 +46,6 @@
4546
import bigframes.operations as ops
4647
import bigframes.operations.aggregations as agg_ops
4748
import bigframes.session._io.pandas
48-
import third_party.bigframes_vendored.pandas.io.common as vendored_pandas_io_common
4949

5050
# Type constraint for wherever column labels are used
5151
Label = typing.Hashable

‎bigframes/core/compile/aggregate_compiler.py

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

18+
import bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
1819
import ibis
1920
import ibis.expr.datatypes as ibis_dtypes
2021
import ibis.expr.types as ibis_types
@@ -26,7 +27,6 @@
2627
import bigframes.core.window_spec as window_spec
2728
import bigframes.dtypes as dtypes
2829
import bigframes.operations.aggregations as agg_ops
29-
import third_party.bigframes_vendored.ibis.expr.operations as vendored_ibis_ops
3030

3131
scalar_compiler = scalar_compilers.scalar_op_compiler
3232

‎bigframes/core/groupby/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import typing
1818

19+
import bigframes_vendored.pandas.core.groupby as vendored_pandas_groupby
1920
import pandas as pd
2021

2122
import bigframes.constants as constants
@@ -30,7 +31,6 @@
3031
import bigframes.dtypes as dtypes
3132
import bigframes.operations.aggregations as agg_ops
3233
import bigframes.series as series
33-
import third_party.bigframes_vendored.pandas.core.groupby as vendored_pandas_groupby
3434

3535

3636
@log_adapter.class_logger

‎bigframes/core/indexes/index.py

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

22+
import bigframes_vendored.pandas.core.indexes.base as vendored_pandas_index
2223
import google.cloud.bigquery as bigquery
2324
import numpy as np
2425
import pandas
@@ -33,7 +34,6 @@
3334
import bigframes.formatting_helpers as formatter
3435
import bigframes.operations as ops
3536
import bigframes.operations.aggregations as agg_ops
36-
import third_party.bigframes_vendored.pandas.core.indexes.base as vendored_pandas_index
3737

3838
if typing.TYPE_CHECKING:
3939
import bigframes.dataframe

‎bigframes/core/tools/datetimes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
from datetime import datetime
1717
from typing import Optional, Union
1818

19+
import bigframes_vendored.pandas.core.tools.datetimes as vendored_pandas_datetimes
1920
import pandas as pd
2021

2122
import bigframes.constants as constants
2223
import bigframes.core.global_session as global_session
2324
import bigframes.dataframe
2425
import bigframes.operations as ops
2526
import bigframes.series
26-
import third_party.bigframes_vendored.pandas.core.tools.datetimes as vendored_pandas_datetimes
2727

2828

2929
def to_datetime(

‎bigframes/core/utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
import typing
1616
from typing import Hashable, Iterable, List
1717

18+
import bigframes_vendored.pandas.io.common as vendored_pandas_io_common
1819
import pandas as pd
1920
import typing_extensions
2021

21-
import third_party.bigframes_vendored.pandas.io.common as vendored_pandas_io_common
22-
2322
UNNAMED_COLUMN_ID = "bigframes_unnamed_column"
2423
UNNAMED_INDEX_ID = "bigframes_unnamed_index"
2524

0 commit comments

Comments
 (0)