Skip to content

Fixes #4467 : Updates time_series for pandas deprecation#4530

Merged
TomAugspurger merged 4 commits intodask:masterfrom
HSR05:hsr05-patch
Mar 1, 2019
Merged

Fixes #4467 : Updates time_series for pandas deprecation#4530
TomAugspurger merged 4 commits intodask:masterfrom
HSR05:hsr05-patch

Conversation

@HSR05
Copy link
Copy Markdown
Contributor

@HSR05 HSR05 commented Feb 27, 2019

Changes pd.DatetimeIndex to pd.date_range

  • Tests added / passed
  • Passes flake8 dask

cc : @mrocklin please review the PR.
Cheers 👍

Changes pd.DatetimeIndex to pd.date_range
@HSR05
Copy link
Copy Markdown
Contributor Author

HSR05 commented Feb 27, 2019

ref : #4467

@mrocklin
Copy link
Copy Markdown
Member

mrocklin commented Feb 27, 2019 via email

"""
divisions = list(pd.DatetimeIndex(start=start, end=end,
divisions = list(pd.date_range(start=start, end=end,
freq=partition_freq))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line may fail this linter. Need to decent it a bit.

@TomAugspurger
Copy link
Copy Markdown
Member

I see a few more uses of the deprecated pandas behavior throughout dask. Do you mind updating those while you're at it?

dask/dataframe/io/tests/test_demo.py
21:    assert df.divisions == tuple(pd.DatetimeIndex(start='2000', end='2015',

dask/dataframe/io/demo.py
45:    index = pd.DatetimeIndex(start=start, end=end, freq=freq, name='timestamp')
90:    divisions = list(pd.DatetimeIndex(start=start, end=end,

dask/dataframe/tests/test_dataframe.py
1393:    ind = pd.DatetimeIndex(start=start, end=end, freq='60s')

dask/dataframe/core.py
4296:    divisions = pd.DatetimeIndex(start=start,
dask/dataframe/utils.py
393:        return pd.PeriodIndex(start='1970-01-01', periods=2, freq=idx.freq,

@HSR05
Copy link
Copy Markdown
Contributor Author

HSR05 commented Feb 27, 2019

@TomAugspurger yeah sure. I'll look into those and update it asap. 👍

dask/dataframe/io/tests/test_demo.py
21:    assert df.divisions == tuple(pd.DatetimeIndex(start='2000', end='2015',

dask/dataframe/io/demo.py
45:    index = pd.DatetimeIndex(start=start, end=end, freq=freq, name='timestamp')
90:    divisions = list(pd.DatetimeIndex(start=start, end=end,

dask/dataframe/tests/test_dataframe.py
1393:    ind = pd.DatetimeIndex(start=start, end=end, freq='60s')

dask/dataframe/core.py
4296:    divisions = pd.DatetimeIndex(start=start,

dask/dataframe/utils.py
393:        return pd.PeriodIndex(start='1970-01-01', periods=2, freq=idx.freq,
@HSR05
Copy link
Copy Markdown
Contributor Author

HSR05 commented Feb 28, 2019

@TomAugspurger updated the deprecated pandas behavior throughout dask.
Please review the PR.

Cheers 👍

tz=idx.tz, name=idx.name)
elif typ is pd.PeriodIndex:
return pd.PeriodIndex(start='1970-01-01', periods=2, freq=idx.freq,
return pd.date_range(start='1970-01-01', periods=2, freq=idx.freq,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pd.period_range.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pd.period_range.

My bad. Thanks for the review.
Updated it. @TomAugspurger

@TomAugspurger
Copy link
Copy Markdown
Member

Some linting errors: https://travis-ci.org/dask/dask/jobs/499881647#L2092

you can run flake8 locally on those files to verify.

@mrocklin
Copy link
Copy Markdown
Member

mrocklin commented Mar 1, 2019

I've pushed flake8 fixes. The current failure is unrelated, and being handled in #4537

@TomAugspurger is everything else here good to be merged?

@TomAugspurger
Copy link
Copy Markdown
Member

👍

@TomAugspurger TomAugspurger merged commit de6d6c2 into dask:master Mar 1, 2019
@TomAugspurger
Copy link
Copy Markdown
Member

Thanks @HSR05!

@mrocklin
Copy link
Copy Markdown
Member

mrocklin commented Mar 1, 2019

Thanks @HSR05 !

Also, I notice that this is your first code contribution to this repository. Welcome!

jorge-pessoa pushed a commit to jorge-pessoa/dask that referenced this pull request May 14, 2019
* Fixes dask#4467 : Updates time_series for pandas deprecation

Changes pd.DatetimeIndex to pd.date_range
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants