Skip to content

[SPARK-43709][PS] Remove closed parameter from ps.date_range & enable test. #42389

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

Closed
wants to merge 2 commits into from
Closed

[SPARK-43709][PS] Remove closed parameter from ps.date_range & enable test. #42389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f801856
[][PS] Remove closed parameter from ps.date_range & enable test.
itholic Aug 8, 2023
b2ca8d7
resolve
itholic Aug 9, 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
1 change: 1 addition & 0 deletions python/docs/source/migration_guide/pyspark_upgrade.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Upgrading from PySpark 3.5 to 4.0
* In Spark 4.0, ``Series.mad`` has been removed from pandas API on Spark.
* In Spark 4.0, ``na_sentinel`` parameter from ``Index.factorize`` and `Series.factorize`` has been removed from pandas API on Spark, use ``use_na_sentinel`` instead.
* In Spark 4.0, ``inplace`` parameter from ``Categorical.add_categories``, ``Categorical.remove_categories``, ``Categorical.set_categories``, ``Categorical.rename_categories``, ``Categorical.reorder_categories``, ``Categorical.as_ordered``, ``Categorical.as_unordered`` have been removed from pandas API on Spark.
* In Spark 4.0, ``closed`` parameter from ``ps.date_range`` has been removed from pandas API on Spark.


Upgrading from PySpark 3.3 to 3.4
Expand Down
38 changes: 1 addition & 37 deletions python/pyspark/pandas/namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ def pandas_to_datetime(
)


# TODO(SPARK-42621): Add `inclusive` parameter and replace `closed`.
# TODO(SPARK-42621): Add `inclusive` parameter.
# See https://github.com/pandas-dev/pandas/issues/40245
def date_range(
start: Union[str, Any] = None,
Expand All @@ -1761,7 +1761,6 @@ def date_range(
tz: Optional[Union[str, tzinfo]] = None,
normalize: bool = False,
name: Optional[str] = None,
closed: Optional[str] = None,
**kwargs: Any,
) -> DatetimeIndex:
"""
Expand All @@ -1785,12 +1784,6 @@ def date_range(
Normalize start/end dates to midnight before generating date range.
name : str, default None
Name of the resulting DatetimeIndex.
closed : {None, 'left', 'right'}, optional
Make the interval closed with respect to the given frequency to
the 'left', 'right', or both sides (None, the default).

.. deprecated:: 3.4.0

**kwargs
For compatibility. Has no effect on the result.

Expand Down Expand Up @@ -1874,37 +1867,9 @@ def date_range(
DatetimeIndex(['2018-01-31', '2018-04-30', '2018-07-31', '2018-10-31',
'2019-01-31'],
dtype='datetime64[ns]', freq=None)

`closed` controls whether to include `start` and `end` that are on the
boundary. The default includes boundary points on either end.

>>> ps.date_range(
... start='2017-01-01', end='2017-01-04', closed=None
... ) # doctest: +SKIP
DatetimeIndex(['2017-01-01', '2017-01-02', '2017-01-03', '2017-01-04'],
dtype='datetime64[ns]', freq=None)

Use ``closed='left'`` to exclude `end` if it falls on the boundary.

>>> ps.date_range(
... start='2017-01-01', end='2017-01-04', closed='left'
... ) # doctest: +SKIP
DatetimeIndex(['2017-01-01', '2017-01-02', '2017-01-03'], dtype='datetime64[ns]', freq=None)

Use ``closed='right'`` to exclude `start` if it falls on the boundary.

>>> ps.date_range(
... start='2017-01-01', end='2017-01-04', closed='right'
... ) # doctest: +SKIP
DatetimeIndex(['2017-01-02', '2017-01-03', '2017-01-04'], dtype='datetime64[ns]', freq=None)
"""
assert freq not in ["N", "ns"], "nanoseconds is not supported"
assert tz is None, "Localized DatetimeIndex is not supported"
if closed is not None:
warnings.warn(
"Argument `closed` is deprecated in 3.4.0 and will be removed in 4.0.0.",
FutureWarning,
)

return cast(
DatetimeIndex,
Expand All @@ -1917,7 +1882,6 @@ def date_range(
tz=tz,
normalize=normalize,
name=name,
closed=closed,
**kwargs,
)
),
Expand Down
14 changes: 0 additions & 14 deletions python/pyspark/pandas/tests/test_namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,6 @@ def test_to_datetime(self):
self.assert_eq(pd.to_datetime(pdf), ps.to_datetime(psdf))
self.assert_eq(pd.to_datetime(dict_from_pdf), ps.to_datetime(dict_from_pdf))

@unittest.skipIf(
LooseVersion(pd.__version__) >= LooseVersion("2.0.0"),
"TODO(SPARK-43709): Enable NamespaceTests.test_date_range for pandas 2.0.0.",
)
def test_date_range(self):
self.assert_eq(
ps.date_range(start="1/1/2018", end="1/08/2018"),
Expand Down Expand Up @@ -225,16 +221,6 @@ def test_date_range(self):
pd.date_range(start="1/1/2018", periods=5, freq=pd.offsets.MonthEnd(3)),
)

self.assert_eq(
ps.date_range(start="2017-01-01", end="2017-01-04", closed="left"),
pd.date_range(start="2017-01-01", end="2017-01-04", closed="left"),
)

self.assert_eq(
ps.date_range(start="2017-01-01", end="2017-01-04", closed="right"),
pd.date_range(start="2017-01-01", end="2017-01-04", closed="right"),
)

self.assertRaises(
AssertionError, lambda: ps.date_range(start="1/1/2018", periods=5, tz="Asia/Tokyo")
)
Expand Down