Skip to content

Add return type of to_koalas and to_pandas #1857

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 5 commits into from
Oct 17, 2020
Merged

Add return type of to_koalas and to_pandas #1857

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac5d103
Add return type of to_koalas and to_pandas
xinrong-meng Oct 16, 2020
2efff7f
Pandas_DataFrame in quote
xinrong-meng Oct 16, 2020
ff83869
Resolve comments
xinrong-meng Oct 17, 2020
22c72a3
Revert import change
xinrong-meng Oct 17, 2020
c8a49ba
Remove double quotes
xinrong-meng Oct 17, 2020
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
19 changes: 15 additions & 4 deletions databricks/koalas/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,18 @@
from functools import partial, reduce
import sys
from itertools import zip_longest
from typing import Any, Optional, List, Tuple, Union, Generic, TypeVar, Iterable, Dict, Callable
from typing import (
Any,
Callable,
Dict,
Optional,
Generic,
Iterable,
List,
Tuple,
TypeVar,
Union,
)

import numpy as np
import pandas as pd
Expand Down Expand Up @@ -3976,7 +3987,7 @@ def duplicated(self, subset=None, keep="first"):
)
)

def to_koalas(self, index_col: Optional[Union[str, List[str]]] = None):
def to_koalas(self, index_col: Optional[Union[str, List[str]]] = None) -> "DataFrame":
"""
Converts the existing DataFrame into a Koalas DataFrame.

Expand Down Expand Up @@ -4250,7 +4261,7 @@ def to_spark(self, index_col: Optional[Union[str, List[str]]] = None):

to_spark.__doc__ = SparkFrameMethods.__doc__

def to_pandas(self):
def to_pandas(self) -> "pd.DataFrame":
"""
Return a pandas DataFrame.

Expand All @@ -4271,7 +4282,7 @@ def to_pandas(self):
return self._internal.to_pandas_frame.copy()

# Alias to maintain backward compatibility with Spark
def toPandas(self):
def toPandas(self) -> "pd.DataFrame":
warnings.warn(
"DataFrame.toPandas is deprecated as of DataFrame.to_pandas. "
"Please use the API instead.",
Expand Down
4 changes: 2 additions & 2 deletions databricks/koalas/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ def to_latex(

to_latex.__doc__ = DataFrame.to_latex.__doc__

def to_pandas(self):
def to_pandas(self) -> "pd.Series":
"""
Return a pandas Series.

Expand All @@ -1461,7 +1461,7 @@ def to_pandas(self):
return first_series(self._internal.to_pandas_frame.copy())

# Alias to maintain backward compatibility with Spark
def toPandas(self):
def toPandas(self) -> "pd.Series":
warnings.warn(
"Series.toPandas is deprecated as of Series.to_pandas. Please use the API instead.",
FutureWarning,
Expand Down