Skip to content

CLN: Move period.pyx to tslibs/period.pyx #18555

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 9 commits into from
Dec 3, 2017
Merged

CLN: Move period.pyx to tslibs/period.pyx #18555

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7748a45
CLN: #18543, moving periods.pyx
AaronCritchley Nov 28, 2017
b093f40
Flake8 pass
AaronCritchley Nov 28, 2017
0959e67
Flake8 pass
AaronCritchley Nov 28, 2017
61e299d
Better imports, moving pickle_compat
AaronCritchley Dec 2, 2017
a14b37e
Merge branch 'master' into improvement/moving-period-to-tslibs
AaronCritchley Dec 2, 2017
bb286a8
Tidier imports
AaronCritchley Dec 2, 2017
ece5218
Removing trailing comma in pickle_compat
AaronCritchley Dec 2, 2017
331d3e6
Moving usage in datetimes.py
AaronCritchley Dec 3, 2017
dd5021f
Implementing suggested changes from PR
AaronCritchley Dec 3, 2017
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
26 changes: 13 additions & 13 deletions pandas/_libs/period.pyx → pandas/_libs/tslibs/period.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ from pandas.compat import PY2

cimport cython

from tslibs.np_datetime cimport (pandas_datetimestruct,
dtstruct_to_dt64, dt64_to_dtstruct,
is_leapyear)
from pandas._libs.tslibs.np_datetime cimport (pandas_datetimestruct,
Copy link
Contributor

@jreback jreback Nov 28, 2017

Choose a reason for hiding this comment

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

the beauty here is that you can do

from np_datetime cimport .... and so on , the puts period in the same dir as all of the tslibs

dtstruct_to_dt64,
dt64_to_dtstruct, is_leapyear)


cimport util
from util cimport is_period_object, is_string_object, INT32_MIN

from missing cimport is_null_datetimelike
from pandas._libs.missing cimport is_null_datetimelike
from pandas._libs.tslib import Timestamp
Copy link
Contributor

@jreback jreback Dec 3, 2017

Choose a reason for hiding this comment

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

change this to

```from timestamps import Timestamp``

Copy link
Contributor Author

@AaronCritchley AaronCritchley Dec 3, 2017

Choose a reason for hiding this comment

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

Good spot, I shouldn't have missed this, thanks!

from tslibs.timezones cimport (
from pandas._libs.tslibs.timezones cimport (
is_utc, is_tzlocal, get_utcoffset, get_dst_info)
from tslibs.timedeltas cimport delta_to_nanoseconds

from tslibs.parsing import (parse_time_string, NAT_SENTINEL,
_get_rule_month, _MONTH_NUMBERS)
from tslibs.frequencies cimport get_freq_code
from tslibs.resolution import resolution, Resolution
from tslibs.nattype import nat_strings, NaT, iNaT
from tslibs.nattype cimport _nat_scalar_rules, NPY_NAT
from pandas._libs.tslibs.timedeltas cimport delta_to_nanoseconds

from pandas._libs.tslibs.parsing import (parse_time_string, NAT_SENTINEL,
_get_rule_month, _MONTH_NUMBERS)
from pandas._libs.tslibs.frequencies cimport get_freq_code
from pandas._libs.tslibs.resolution import resolution, Resolution
from pandas._libs.tslibs.nattype import nat_strings, NaT, iNaT
from pandas._libs.tslibs.nattype cimport _nat_scalar_rules, NPY_NAT

from pandas.tseries import offsets
from pandas.tseries import frequencies
Expand Down
6 changes: 5 additions & 1 deletion pandas/compat/pickle_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,11 @@ def load_reduce(self):
('pandas.tseries.index', 'DatetimeIndex'):
('pandas.core.indexes.datetimes', 'DatetimeIndex'),
('pandas.tseries.period', 'PeriodIndex'):
('pandas.core.indexes.period', 'PeriodIndex')
('pandas.core.indexes.period', 'PeriodIndex'),

# 18543 moving period
Copy link
Contributor

@jreback jreback Nov 28, 2017

Choose a reason for hiding this comment

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

is there a reason you are changing this? this is a private import and should not be needed

Copy link
Contributor Author

@AaronCritchley AaronCritchley Nov 29, 2017

Choose a reason for hiding this comment

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

I saw ('pandas._period', 'Period'): ('pandas._libs.period', 'Period'), on Line 77, and was under the impression I needed to add something for this too.

Although I now realise that even if I did need this code, it would be wrong cause I'd need to modify the value on L77 too.

Would you like me to just remove this new line? and should I modify L77 too?

Copy link
Contributor

@jreback jreback Nov 29, 2017

Choose a reason for hiding this comment

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

hmm ok
why don’t u put the line right under the other one then

Copy link
Contributor Author

@AaronCritchley AaronCritchley Nov 29, 2017

Choose a reason for hiding this comment

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

Good point, they seemed to be 'batched' by issue, but it'd be more readable if it was under the original, will move!

('pandas._libs.period', 'Period'):
('pandas._libs.tslibs.period', 'Period')
}


Expand Down
2 changes: 1 addition & 1 deletion pandas/core/indexes/accessors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from pandas.core.accessor import PandasDelegate
from pandas.core.base import NoNewAttributesMixin, PandasObject
from pandas.core.indexes.datetimes import DatetimeIndex
from pandas._libs.period import IncompatibleFrequency # noqa
from pandas._libs.tslibs.period import IncompatibleFrequency # noqa
from pandas.core.indexes.period import PeriodIndex
from pandas.core.indexes.timedeltas import TimedeltaIndex
from pandas.core.algorithms import take_1d
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/indexes/datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import pandas.io.formats.printing as printing
from pandas._libs import lib, iNaT, NaT
from pandas._libs.period import Period
from pandas._libs.tslibs.period import Period
from pandas._libs.tslibs.timedeltas import delta_to_nanoseconds

from pandas.core.indexes.base import Index, _index_shared_docs
Expand Down
10 changes: 5 additions & 5 deletions pandas/core/indexes/period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
import pandas.tseries.offsets as offsets

from pandas._libs.lib import infer_dtype
from pandas._libs import tslib, period, index as libindex
from pandas._libs.period import (Period, IncompatibleFrequency,
get_period_field_arr, _validate_end_alias,
_quarter_to_myear)
from pandas._libs import tslib, index as libindex
from pandas._libs.tslibs.period import (Period, IncompatibleFrequency,
get_period_field_arr,
_validate_end_alias, _quarter_to_myear)
from pandas._libs.tslibs.fields import isleapyear_arr
from pandas._libs.tslibs import resolution
from pandas._libs.tslibs import resolution, period
from pandas._libs.tslibs.timedeltas import delta_to_nanoseconds

from pandas.core.base import _shared_docs
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from pandas._libs import lib, tslib
from pandas._libs.lib import Timestamp
from pandas._libs.period import IncompatibleFrequency
from pandas._libs.tslibs.period import IncompatibleFrequency

from pandas.util._decorators import Appender
from pandas.core.generic import _shared_docs
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/indexes/period/test_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pandas._libs import tslib, tslibs
from pandas import (PeriodIndex, Series, DatetimeIndex,
period_range, Period)
from pandas._libs import period as libperiod
from pandas._libs.tslibs import period as libperiod


class TestGetItem(object):
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/indexes/period/test_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pandas.core.indexes.period as period
from pandas.compat import lrange
from pandas.tseries.frequencies import get_freq, MONTHS
from pandas._libs.period import period_ordinal, period_asfreq
from pandas._libs.tslibs.period import period_ordinal, period_asfreq
from pandas import (PeriodIndex, Period, DatetimeIndex, Timestamp, Series,
date_range, to_datetime, period_range)

Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/scalar/test_period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
from pandas.compat import text_type, iteritems
from pandas.compat.numpy import np_datetime64_compat

from pandas._libs import tslib, period as libperiod
from pandas._libs import tslib
from pandas._libs.tslibs import period as libperiod
from pandas._libs.tslibs.parsing import DateParseError
from pandas import Period, Timestamp, offsets
from pandas._libs.tslibs.resolution import DAYS, _MONTHS as MONTHS
Expand Down
3 changes: 1 addition & 2 deletions pandas/tests/scalar/test_timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

import pandas.util.testing as tm
from pandas.tseries import offsets, frequencies
from pandas._libs import period
from pandas._libs.tslibs.timezones import get_timezone
from pandas._libs.tslibs import conversion
from pandas._libs.tslibs import conversion, period

from pandas.compat import long, PY3
from pandas.util.testing import assert_series_equal
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/test_resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from pandas.core.indexes.timedeltas import timedelta_range, TimedeltaIndex
from pandas.util.testing import (assert_series_equal, assert_almost_equal,
assert_frame_equal, assert_index_equal)
from pandas._libs.period import IncompatibleFrequency
from pandas._libs.tslibs.period import IncompatibleFrequency

bday = BDay()

Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ class CheckSDist(sdist_class):
_pyxfiles = ['pandas/_libs/lib.pyx',
'pandas/_libs/hashtable.pyx',
'pandas/_libs/tslib.pyx',
'pandas/_libs/period.pyx',
'pandas/_libs/index.pyx',
'pandas/_libs/algos.pyx',
'pandas/_libs/join.pyx',
Expand All @@ -344,6 +343,7 @@ class CheckSDist(sdist_class):
'pandas/_libs/skiplist.pyx',
'pandas/_libs/sparse.pyx',
'pandas/_libs/parsers.pyx',
'pandas/_libs/tslibs/period.pyx',
'pandas/_libs/tslibs/strptime.pyx',
'pandas/_libs/tslibs/np_datetime.pyx',
'pandas/_libs/tslibs/timedeltas.pyx',
Expand Down Expand Up @@ -530,8 +530,8 @@ def pxd(name):
'pandas/_libs/src/numpy_helper.h'],
'sources': ['pandas/_libs/src/parser/tokenizer.c',
'pandas/_libs/src/parser/io.c']},
'_libs.period': {
'pyxfile': '_libs/period',
'_libs.tslibs.period': {
'pyxfile': '_libs/tslibs/period',
'pxdfiles': ['_libs/src/util',
'_libs/lib',
'_libs/tslibs/timedeltas',
Expand Down