Skip to content

Commit d19e7a7

Browse files
committed
pandas._period -> pandas.libs.period
1 parent 12a443e commit d19e7a7

File tree

11 files changed

+29
-31
lines changed

11 files changed

+29
-31
lines changed

doc/source/whatsnew/v0.20.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
472472
"pandas.hashtable", "pandas.libs.hashtable", ""
473473
"pandas._window", "pandas.core.libwindow", ""
474474
"pandas._join", "pandas.libs.join", ""
475+
"pandas._period", "pandas.libs.period", ""
475476

476477

477478
.. _whatsnew_0200.api_breaking.groupby_describe:

pandas/src/period.pyx renamed to pandas/libs/period.pyx

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ from pandas.tseries.tools import parse_time_string
2222

2323
cimport cython
2424
from datetime cimport *
25-
cimport util
26-
from .libs cimport lib
27-
from .libs.lib cimport is_null_datetimelike, is_period
25+
cimport util, lib
26+
from lib cimport is_null_datetimelike, is_period
2827
from pandas.libs import tslib, lib
2928
from pandas.libs.tslib import (Timedelta, Timestamp, iNaT,
3029
NaT, have_pytz, _get_utcoffset)
31-
from libs.tslib cimport (
30+
from tslib cimport (
3231
maybe_get_tz,
3332
_is_utc,
3433
_is_tzlocal,

pandas/tests/indexes/period/test_tools.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pandas.tseries.period as period
77
from pandas.compat import lrange
88
from pandas.tseries.frequencies import get_freq, MONTHS
9-
from pandas._period import period_ordinal, period_asfreq
9+
from pandas.libs.period import period_ordinal, period_asfreq
1010
from pandas import (PeriodIndex, Period, DatetimeIndex, Timestamp, Series,
1111
date_range, to_datetime, period_range)
1212

pandas/tests/scalar/test_timestamp.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99

1010
import pandas as pd
1111
import pandas.util.testing as tm
12-
import pandas._period as period
12+
1313
from pandas.tseries import offsets, frequencies
14-
from pandas.libs import tslib
14+
from pandas.libs import tslib, period
1515
from pandas.libs.tslib import get_timezone, iNaT
16+
1617
from pandas.compat import lrange, long
1718
from pandas.util.testing import assert_series_equal
1819
from pandas.compat.numpy import np_datetime64_compat

pandas/tests/tseries/test_resample.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from pandas.tseries.tdi import timedelta_range, TimedeltaIndex
2727
from pandas.util.testing import (assert_series_equal, assert_almost_equal,
2828
assert_frame_equal, assert_index_equal)
29-
from pandas._period import IncompatibleFrequency
29+
from pandas.libs.period import IncompatibleFrequency
3030

3131
bday = BDay()
3232

pandas/tseries/base.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
from pandas.core.common import AbstractMethodError
2121

2222
import pandas.formats.printing as printing
23-
from pandas.libs import tslib
24-
import pandas._period as prlib
25-
import pandas.libs.lib as lib
23+
from pandas.libs import tslib, lib, period as _period
24+
2625
from pandas.core.index import Index
2726
from pandas.indexes.base import _index_shared_docs
2827
from pandas.util.decorators import Appender, cache_readonly
@@ -669,7 +668,7 @@ def __sub__(self, other):
669668
return self.shift(-other)
670669
elif isinstance(other, (tslib.Timestamp, datetime)):
671670
return self._sub_datelike(other)
672-
elif isinstance(other, prlib.Period):
671+
elif isinstance(other, _period.Period):
673672
return self._sub_period(other)
674673
else: # pragma: no cover
675674
return NotImplemented

pandas/tseries/common.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
from pandas.core.base import PandasDelegate, NoNewAttributesMixin
1515
from pandas.tseries.index import DatetimeIndex
16-
from pandas._period import IncompatibleFrequency # flake8: noqa
16+
from pandas.libs import tslib
17+
from pandas.libs.period import IncompatibleFrequency # flake8: noqa
1718
from pandas.tseries.period import PeriodIndex
1819
from pandas.tseries.tdi import TimedeltaIndex
19-
from pandas.libs import tslib
2020
from pandas.core.algorithms import take_1d
2121

2222

pandas/tseries/index.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@
4444
import pandas.tseries.offsets as offsets
4545
import pandas.tseries.tools as tools
4646

47-
from pandas.libs import (lib, index as _index, tslib,
47+
from pandas.libs import (lib, index as _index, tslib, period,
4848
algos as _algos, join as _join)
4949
from pandas.libs.lib import Timestamp
50-
import pandas._period as period
5150

5251

5352
def _utc():

pandas/tseries/period.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@
3030
from pandas.tseries.tools import parse_time_string
3131
import pandas.tseries.offsets as offsets
3232

33-
import pandas._period as period
34-
from pandas._period import (Period, IncompatibleFrequency,
35-
get_period_field_arr, _validate_end_alias,
36-
_quarter_to_myear)
33+
from pandas.libs.lib import infer_dtype
34+
from pandas.libs import tslib, period
35+
from pandas.libs.period import (Period, IncompatibleFrequency,
36+
get_period_field_arr, _validate_end_alias,
37+
_quarter_to_myear)
3738

3839
from pandas.core.base import _shared_docs
3940
from pandas.indexes.base import _index_shared_docs, _ensure_index
4041

4142
from pandas import compat
4243
from pandas.util.decorators import (Appender, Substitution, cache_readonly,
4344
deprecate_kwarg)
44-
from pandas.libs.lib import infer_dtype
45-
from pandas.libs import tslib
4645
from pandas.compat import zip, u
46+
4747
import pandas.indexes.base as ibase
4848
_index_doc_kwargs = dict(ibase._index_doc_kwargs)
4949
_index_doc_kwargs.update(

pandas/tseries/resample.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
import pandas.compat as compat
2121
from pandas.compat.numpy import function as nv
2222

23+
from pandas.libs import lib, tslib
2324
from pandas.libs.lib import Timestamp
24-
from pandas._period import IncompatibleFrequency
25-
import pandas.libs.lib as lib
26-
import pandas.libs.tslib as tslib
25+
from pandas.libs.period import IncompatibleFrequency
2726

2827
from pandas.util.decorators import Appender
2928
from pandas.core.generic import _shared_docs

setup.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,11 @@ class CheckSDist(sdist_class):
329329
_pyxfiles = ['pandas/lib.pyx',
330330
'pandas/libs/hashtable.pyx',
331331
'pandas/libs/tslib.pyx',
332+
'pandas/libs/period.pyx',
332333
'pandas/libs/index.pyx',
333334
'pandas/libs/algos.pyx',
334335
'pandas/libs/join.pyx',
335336
'pandas/core/window.pyx',
336-
'pandas/src/period.pyx',
337337
'pandas/sparse/sparse.pyx',
338338
'pandas/util/testing.pyx',
339339
'pandas/tools/hash.pyx',
@@ -483,11 +483,11 @@ def pxd(name):
483483
'sources': ['pandas/src/datetime/np_datetime.c',
484484
'pandas/src/datetime/np_datetime_strings.c',
485485
'pandas/src/period_helper.c']},
486-
'_period': {'pyxfile': 'src/period',
487-
'depends': tseries_depends,
488-
'sources': ['pandas/src/datetime/np_datetime.c',
489-
'pandas/src/datetime/np_datetime_strings.c',
490-
'pandas/src/period_helper.c']},
486+
'libs.period': {'pyxfile': 'libs/period',
487+
'depends': tseries_depends,
488+
'sources': ['pandas/src/datetime/np_datetime.c',
489+
'pandas/src/datetime/np_datetime_strings.c',
490+
'pandas/src/period_helper.c']},
491491
'libs.index': {'pyxfile': 'libs/index',
492492
'sources': ['pandas/src/datetime/np_datetime.c',
493493
'pandas/src/datetime/np_datetime_strings.c'],

0 commit comments

Comments
 (0)