some more

Author: TomAugspurger

asv_bench/benchmarks/period.py

@@ -1,5 +1,5 @@
-from pandas import (DataFrame, Series, Period, PeriodIndex, date_range,
-                    period_range)
+from pandas import (
+    DataFrame, Period, PeriodIndex, Series, date_range, period_range)
 
 
 class PeriodProperties(object):
@@ -94,7 +94,7 @@ def time_value_counts(self, typ):
 class Indexing(object):
 
     def setup(self):
-        self.index = PeriodIndex(start='1985', periods=1000, freq='D')
+        self.index = period_range(start='1985', periods=1000, freq='D')
         self.series = Series(range(1000), index=self.index)
         self.period = self.index[500]
 

doc/source/whatsnew/v0.21.0.rst

@@ -654,7 +654,7 @@ Previous Behavior:
 
 .. code-block:: ipython
 
-   In [1]: pi = pd.PeriodIndex(start='2000-01-01', freq='D', periods=10)
+   In [1]: pi = pd.period_range(start='2000-01-01', freq='D', periods=10)
 
    In [2]: s = pd.Series(np.arange(10), index=pi)
 
@@ -674,7 +674,7 @@ New Behavior:
 
 .. ipython:: python
 
-   pi = pd.PeriodIndex(start='2000-01-01', freq='D', periods=10)
+   pi = pd.period_range(start='2000-01-01', freq='D', periods=10)
 
    s = pd.Series(np.arange(10), index=pi)
 

pandas/core/resample.py

@@ -1491,10 +1491,10 @@ def _get_time_period_bins(self, ax):
             binner = labels = PeriodIndex(data=[], freq=freq, name=ax.name)
             return binner, [], labels
 
-        labels = binner = PeriodIndex(start=ax[0],
-                                      end=ax[-1],
-                                      freq=freq,
-                                      name=ax.name)
+        labels = binner = pd.period_range(start=ax[0],
+                                          end=ax[-1],
+                                          freq=freq,
+                                          name=ax.name)
 
         end_stamps = (labels + freq).asfreq(freq, 's').to_timestamp()
         if ax.tzinfo:
@@ -1543,8 +1543,8 @@ def _get_period_bins(self, ax):
             bin_shift = start_offset.n % freq_mult
             start = p_start
 
-        labels = binner = PeriodIndex(start=start, end=end,
-                                      freq=self.freq, name=ax.name)
+        labels = binner = pd.period_range(start=start, end=end,
+                                          freq=self.freq, name=ax.name)
 
         i8 = memb.asi8
 

pandas/plotting/_converter.py

@@ -22,7 +22,7 @@
 import pandas.core.common as com
 from pandas.core.index import Index
 from pandas.core.indexes.datetimes import date_range
-from pandas.core.indexes.period import Period, PeriodIndex
+from pandas.core.indexes.period import Period, PeriodIndex, period_range
 import pandas.core.tools.datetimes as tools
 
 import pandas.tseries.frequencies as frequencies
@@ -630,7 +630,7 @@ def _daily_finder(vmin, vmax, freq):
     (vmin, vmax) = (Period(ordinal=int(vmin), freq=freq),
                     Period(ordinal=int(vmax), freq=freq))
     span = vmax.ordinal - vmin.ordinal + 1
-    dates_ = PeriodIndex(start=vmin, end=vmax, freq=freq)
+    dates_ = period_range(start=vmin, end=vmax, freq=freq)
     # Initialize the output
     info = np.zeros(span,
                     dtype=[('val', np.int64), ('maj', bool),

pandas/tests/frame/test_join.py

@@ -3,7 +3,7 @@
 import pytest
 import numpy as np
 
-from pandas import DataFrame, Index, PeriodIndex
+from pandas import DataFrame, Index, period_range
 from pandas.tests.frame.common import TestData
 import pandas.util.testing as tm
 
@@ -13,7 +13,7 @@ def frame_with_period_index():
     return DataFrame(
         data=np.arange(20).reshape(4, 5),
         columns=list('abcde'),
-        index=PeriodIndex(start='2000', freq='A', periods=4))
+        index=period_range(start='2000', freq='A', periods=4))
 
 
 @pytest.fixture

pandas/tests/frame/test_period.py

@@ -44,7 +44,7 @@ def test_frame_setitem(self):
 
     def test_frame_to_time_stamp(self):
         K = 5
-        index = PeriodIndex(freq='A', start='1/1/2001', end='12/1/2009')
+        index = period_range(freq='A', start='1/1/2001', end='12/1/2009')
         df = DataFrame(randn(len(index), K), index=index)
         df['mix'] = 'a'
 

pandas/tests/indexes/period/test_period.py

@@ -98,7 +98,7 @@ def test_hash_error(self):
             hash(index)
 
     def test_make_time_series(self):
-        index = PeriodIndex(freq='A', start='1/1/2001', end='12/1/2009')
+        index = period_range(freq='A', start='1/1/2001', end='12/1/2009')
         series = Series(1, index=index)
         assert isinstance(series, Series)
 
@@ -165,50 +165,50 @@ def test_values(self):
         tm.assert_numpy_array_equal(idx._ndarray_values, exp)
 
     def test_period_index_length(self):
-        pi = PeriodIndex(freq='A', start='1/1/2001', end='12/1/2009')
+        pi = period_range(freq='A', start='1/1/2001', end='12/1/2009')
         assert len(pi) == 9
 
-        pi = PeriodIndex(freq='Q', start='1/1/2001', end='12/1/2009')
+        pi = period_range(freq='Q', start='1/1/2001', end='12/1/2009')
         assert len(pi) == 4 * 9
 
-        pi = PeriodIndex(freq='M', start='1/1/2001', end='12/1/2009')
+        pi = period_range(freq='M', start='1/1/2001', end='12/1/2009')
         assert len(pi) == 12 * 9
 
         start = Period('02-Apr-2005', 'B')
-        i1 = PeriodIndex(start=start, periods=20)
+        i1 = period_range(start=start, periods=20)
         assert len(i1) == 20
         assert i1.freq == start.freq
         assert i1[0] == start
 
         end_intv = Period('2006-12-31', 'W')
-        i1 = PeriodIndex(end=end_intv, periods=10)
+        i1 = period_range(end=end_intv, periods=10)
         assert len(i1) == 10
         assert i1.freq == end_intv.freq
         assert i1[-1] == end_intv
 
         end_intv = Period('2006-12-31', '1w')
-        i2 = PeriodIndex(end=end_intv, periods=10)
+        i2 = period_range(end=end_intv, periods=10)
         assert len(i1) == len(i2)
         assert (i1 == i2).all()
         assert i1.freq == i2.freq
 
         end_intv = Period('2006-12-31', ('w', 1))
-        i2 = PeriodIndex(end=end_intv, periods=10)
+        i2 = period_range(end=end_intv, periods=10)
         assert len(i1) == len(i2)
         assert (i1 == i2).all()
         assert i1.freq == i2.freq
 
         try:
-            PeriodIndex(start=start, end=end_intv)
+            period_range(start=start, end=end_intv)
             raise AssertionError('Cannot allow mixed freq for start and end')
         except ValueError:
             pass
 
         end_intv = Period('2005-05-01', 'B')
-        i1 = PeriodIndex(start=start, end=end_intv)
+        i1 = period_range(start=start, end=end_intv)
 
         try:
-            PeriodIndex(start=start)
+            period_range(start=start)
             raise AssertionError(
                 'Must specify periods if missing start or end')
         except ValueError:
@@ -233,33 +233,33 @@ def test_fields(self):
         # year, month, day, hour, minute
         # second, weekofyear, week, dayofweek, weekday, dayofyear, quarter
         # qyear
-        pi = PeriodIndex(freq='A', start='1/1/2001', end='12/1/2005')
+        pi = period_range(freq='A', start='1/1/2001', end='12/1/2005')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='Q', start='1/1/2001', end='12/1/2002')
+        pi = period_range(freq='Q', start='1/1/2001', end='12/1/2002')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='M', start='1/1/2001', end='1/1/2002')
+        pi = period_range(freq='M', start='1/1/2001', end='1/1/2002')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='D', start='12/1/2001', end='6/1/2001')
+        pi = period_range(freq='D', start='12/1/2001', end='6/1/2001')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='B', start='12/1/2001', end='6/1/2001')
+        pi = period_range(freq='B', start='12/1/2001', end='6/1/2001')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='H', start='12/31/2001', end='1/1/2002 23:00')
+        pi = period_range(freq='H', start='12/31/2001', end='1/1/2002 23:00')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='Min', start='12/31/2001', end='1/1/2002 00:20')
+        pi = period_range(freq='Min', start='12/31/2001', end='1/1/2002 00:20')
         self._check_all_fields(pi)
 
-        pi = PeriodIndex(freq='S', start='12/31/2001 00:00:00',
-                         end='12/31/2001 00:05:00')
+        pi = period_range(freq='S', start='12/31/2001 00:00:00',
+                          end='12/31/2001 00:05:00')
         self._check_all_fields(pi)
 
         end_intv = Period('2006-12-31', 'W')
-        i1 = PeriodIndex(end=end_intv, periods=10)
+        i1 = period_range(end=end_intv, periods=10)
         self._check_all_fields(i1)
 
     def _check_all_fields(self, periodindex):
@@ -325,8 +325,8 @@ def test_factorize(self):
         tm.assert_index_equal(idx, exp_idx)
 
     def test_is_(self):
-        create_index = lambda: PeriodIndex(freq='A', start='1/1/2001',
-                                           end='12/1/2009')
+        create_index = lambda: period_range(freq='A', start='1/1/2001',
+                                            end='12/1/2009')
         index = create_index()
         assert index.is_(index)
         assert not index.is_(create_index())
@@ -371,13 +371,13 @@ def test_periods_number_check(self):
 
     def test_start_time(self):
         # GH 17157
-        index = PeriodIndex(freq='M', start='2016-01-01', end='2016-05-31')
+        index = period_range(freq='M', start='2016-01-01', end='2016-05-31')
         expected_index = date_range('2016-01-01', end='2016-05-31', freq='MS')
         tm.assert_index_equal(index.start_time, expected_index)
 
     def test_end_time(self):
         # GH 17157
-        index = PeriodIndex(freq='M', start='2016-01-01', end='2016-05-31')
+        index = period_range(freq='M', start='2016-01-01', end='2016-05-31')
         expected_index = date_range('2016-01-01', end='2016-05-31', freq='M')
         expected_index = expected_index.shift(1, freq='D').shift(-1, freq='ns')
         tm.assert_index_equal(index.end_time, expected_index)
@@ -457,7 +457,8 @@ def test_numpy_repeat(self):
             np.repeat(index, 2, axis=1)
 
     def test_pindex_multiples(self):
-        pi = PeriodIndex(start='1/1/11', end='12/31/11', freq='2M')
+        with tm.assert_produces_warning(FutureWarning):
+            pi = PeriodIndex(start='1/1/11', end='12/31/11', freq='2M')
         expected = PeriodIndex(['2011-01', '2011-03', '2011-05', '2011-07',
                                 '2011-09', '2011-11'], freq='2M')
         tm.assert_index_equal(pi, expected)
@@ -475,7 +476,7 @@ def test_pindex_multiples(self):
         assert pi.freqstr == '2M'
 
     def test_iteration(self):
-        index = PeriodIndex(start='1/1/10', periods=4, freq='B')
+        index = period_range(start='1/1/10', periods=4, freq='B')
 
         result = list(index)
         assert isinstance(result[0], Period)

pandas/tests/indexes/period/test_tools.py

@@ -297,7 +297,7 @@ def test_to_timestamp_pi_mult(self):
         tm.assert_index_equal(result, expected)
 
     def test_to_timestamp_pi_combined(self):
-        idx = PeriodIndex(start='2011', periods=2, freq='1D1H', name='idx')
+        idx = period_range(start='2011', periods=2, freq='1D1H', name='idx')
 
         result = idx.to_timestamp()
         expected = DatetimeIndex(['2011-01-01 00:00', '2011-01-02 01:00'],

pandas/tests/indexes/test_base.py

@@ -1794,7 +1794,7 @@ def test_str_attribute(self, method):
     @pytest.mark.parametrize("index", [
         Index(range(5)), tm.makeDateIndex(10),
         MultiIndex.from_tuples([('foo', '1'), ('bar', '3')]),
-        PeriodIndex(start='2000', end='2010', freq='A')])
+        period_range(start='2000', end='2010', freq='A')])
     def test_str_attribute_raises(self, index):
         with pytest.raises(AttributeError, match='only use .str accessor'):
             index.str.repeat(2)

pandas/tests/resample/test_period_index.py

@@ -660,14 +660,14 @@ def test_loffset_returns_datetimeindex(self, frame, kind, agg_arg):
     @pytest.mark.parametrize('kind', [None, 'period'])
     def test_upsampling_ohlc(self, freq, period_mult, kind):
         # GH 13083
-        pi = PeriodIndex(start='2000', freq='D', periods=10)
+        pi = period_range(start='2000', freq='D', periods=10)
         s = Series(range(len(pi)), index=pi)
         expected = s.to_timestamp().resample(freq).ohlc().to_period(freq)
 
         # timestamp-based resampling doesn't include all sub-periods
         # of the last original period, so extend accordingly:
-        new_index = PeriodIndex(start='2000', freq=freq,
-                                periods=period_mult * len(pi))
+        new_index = period_range(start='2000', freq=freq,
+                                 periods=period_mult * len(pi))
         expected = expected.reindex(new_index)
         result = s.resample(freq, kind=kind).ohlc()
         assert_frame_equal(result, expected)

pandas/tests/tseries/test_frequencies.py

@@ -13,7 +13,6 @@
 from pandas import (
     DatetimeIndex, Index, Series, Timedelta, Timestamp, date_range,
     period_range)
-from pandas.core.indexes.period import PeriodIndex
 from pandas.core.tools.datetimes import to_datetime
 import pandas.util.testing as tm
 
@@ -468,7 +467,7 @@ def test_frequency_misc(self):
 class TestFrequencyInference(object):
 
     def test_raise_if_period_index(self):
-        index = PeriodIndex(start="1/1/1990", periods=20, freq="M")
+        index = period_range(start="1/1/1990", periods=20, freq="M")
         pytest.raises(TypeError, frequencies.infer_freq, index)
 
     def test_raise_if_too_few(self):