Skip to content

REFACTOR-#6805: Move all IO functions to 'modin.pandas.io' module #6806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 7, 2023
Merged

REFACTOR-#6805: Move all IO functions to 'modin.pandas.io' module #6806

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3af9b1
REFACTOR-#6805: Move all IO function to 'modin.pandas.io' module
dchigarev Dec 6, 2023
f815ebd
fix protocol tests
dchigarev Dec 6, 2023
d245294
fix mypy
dchigarev Dec 6, 2023
55d765c
add missing method to '__all__'
dchigarev Dec 6, 2023
1a24eb1
apply review suggestions
dchigarev Dec 7, 2023
fb18942
add custom written 'classproperty' decorator
dchigarev Dec 7, 2023
a2f6f59
isort...........
dchigarev Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions asv_bench/benchmarks/scalability/scalability_benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@
"""These benchmarks are supposed to be run only for modin, since they do not make sense for pandas."""

import modin.pandas as pd
from modin.pandas.utils import from_pandas

try:
from modin.utils import to_numpy, to_pandas
from modin.pandas.io import from_pandas
except ImportError:
# This provides compatibility with older versions of the Modin, allowing us to test old commits.
from modin.pandas.utils import to_pandas
from modin.pandas.utils import from_pandas

try:
from modin.pandas.io import to_numpy, to_pandas
except ImportError:
try:
from modin.utils import to_numpy, to_pandas
except ImportError:
# This provides compatibility with older versions of the Modin, allowing us to test old commits.
from modin.pandas.utils import to_pandas

import pandas

Expand Down
2 changes: 1 addition & 1 deletion ...n/experimental/core/execution/native/implementations/hdk_on_native/test/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
from modin.experimental.core.execution.native.implementations.hdk_on_native.partitioning.partition_manager import (
HdkOnNativeDataframePartitionManager,
)
from modin.pandas.io import from_arrow
from modin.pandas.test.utils import (
bool_arg_values,
df_equals,
Expand All @@ -56,7 +57,6 @@
time_parsing_csv_path,
to_pandas,
)
from modin.pandas.utils import from_arrow
from modin.utils import try_cast_to_pandas

# Our configuration in pytest.ini requires that we explicitly catch all
Expand Down
4 changes: 1 addition & 3 deletions modin/pandas/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
from modin.error_message import ErrorMessage
from modin.logging import disable_logging
from modin.pandas import Categorical
from modin.pandas.io import from_non_pandas, from_pandas, to_pandas

Check notice

Code scanning / CodeQL

Cyclic import

Import of module [modin.pandas.io](1) begins an import cycle.
from modin.utils import (
MODIN_UNNAMED_SERIES_LABEL,
_inherit_docstrings,
expanduser_path_arg,
hashable,
to_pandas,
try_cast_to_pandas,
)

Expand All @@ -62,8 +62,6 @@
SET_DATAFRAME_ATTRIBUTE_WARNING,
_doc_binary_op,
cast_function_modin2pandas,
from_non_pandas,
from_pandas,
)


Expand Down
3 changes: 2 additions & 1 deletion modin/pandas/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
from modin.core.storage_formats.base.query_compiler import BaseQueryCompiler
from modin.error_message import ErrorMessage
from modin.logging import enable_logging
from modin.utils import _inherit_docstrings, to_pandas
from modin.pandas.io import to_pandas
from modin.utils import _inherit_docstrings

from .base import BasePandasDataset
from .dataframe import DataFrame
Expand Down
Loading