Merge remote-tracking branch 'upstream/master' into EA-setitem-regression2

Author: simonjayhawkins

asv_bench/benchmarks/tslibs/period.py

@@ -9,7 +9,12 @@
 
 from pandas.tseries.frequencies import to_offset
 
-from .tslib import _sizes
+from .tslib import _sizes, _tzs
+
+try:
+    from pandas._libs.tslibs.vectorized import dt64arr_to_periodarr
+except ImportError:
+    from pandas._libs.tslibs.period import dt64arr_to_periodarr
 
 
 class PeriodProperties:
@@ -75,26 +80,29 @@ def time_period_constructor(self, freq, is_offset):
         Period("2012-06-01", freq=freq)
 
 
+_freq_ints = [
+    1000,
+    1011,  # Annual - November End
+    2000,
+    2011,  # Quarterly - November End
+    3000,
+    4000,
+    4006,  # Weekly - Saturday End
+    5000,
+    6000,
+    7000,
+    8000,
+    9000,
+    10000,
+    11000,
+    12000,
+]
+
+
 class TimePeriodArrToDT64Arr:
     params = [
         _sizes,
-        [
-            1000,
-            1011,  # Annual - November End
-            2000,
-            2011,  # Quarterly - November End
-            3000,
-            4000,
-            4006,  # Weekly - Saturday End
-            5000,
-            6000,
-            7000,
-            8000,
-            9000,
-            10000,
-            11000,
-            12000,
-        ],
+        _freq_ints,
     ]
     param_names = ["size", "freq"]
 
@@ -104,3 +112,19 @@ def setup(self, size, freq):
 
     def time_periodarray_to_dt64arr(self, size, freq):
         periodarr_to_dt64arr(self.i8values, freq)
+
+
+class TimeDT64ArrToPeriodArr:
+    params = [
+        _sizes,
+        _freq_ints,
+        _tzs,
+    ]
+    param_names = ["size", "freq", "tz"]
+
+    def setup(self, size, freq, tz):
+        arr = np.arange(10, dtype="i8").repeat(size // 10)
+        self.i8values = arr
+
+    def time_dt64arr_to_periodarr(self, size, freq, tz):
+        dt64arr_to_periodarr(self.i8values, freq, tz)

ci/deps/azure-36-minimum_versions.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython=0.29.16
-  - pytest>=5.0.1, <6.0.0rc0
+  - pytest=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-37-locale.yaml

@@ -18,7 +18,7 @@ dependencies:
   - ipython
   - jinja2
   - lxml
-  - matplotlib
+  - matplotlib <3.3.0
   - moto
   - nomkl
   - numexpr

doc/source/reference/groupby.rst

@@ -128,6 +128,7 @@ The following methods are available only for ``SeriesGroupBy`` objects.
 .. autosummary::
    :toctree: api/
 
+   SeriesGroupBy.hist
    SeriesGroupBy.nlargest
    SeriesGroupBy.nsmallest
    SeriesGroupBy.nunique

doc/source/reference/offset_frequency.rst

@@ -33,6 +33,7 @@ Methods
    :toctree: api/
 
     DateOffset.apply
+    DateOffset.apply_index
     DateOffset.copy
     DateOffset.isAnchored
     DateOffset.onOffset
@@ -117,6 +118,7 @@ Methods
    :toctree: api/
 
     BusinessHour.apply
+    BusinessHour.apply_index
     BusinessHour.copy
     BusinessHour.isAnchored
     BusinessHour.onOffset
@@ -201,6 +203,7 @@ Methods
    :toctree: api/
 
     CustomBusinessHour.apply
+    CustomBusinessHour.apply_index
     CustomBusinessHour.copy
     CustomBusinessHour.isAnchored
     CustomBusinessHour.onOffset
@@ -401,6 +404,7 @@ Methods
    :toctree: api/
 
     CustomBusinessMonthEnd.apply
+    CustomBusinessMonthEnd.apply_index
     CustomBusinessMonthEnd.copy
     CustomBusinessMonthEnd.isAnchored
     CustomBusinessMonthEnd.onOffset
@@ -447,6 +451,7 @@ Methods
    :toctree: api/
 
     CustomBusinessMonthBegin.apply
+    CustomBusinessMonthBegin.apply_index
     CustomBusinessMonthBegin.copy
     CustomBusinessMonthBegin.isAnchored
     CustomBusinessMonthBegin.onOffset
@@ -586,6 +591,7 @@ Methods
    :toctree: api/
 
     WeekOfMonth.apply
+    WeekOfMonth.apply_index
     WeekOfMonth.copy
     WeekOfMonth.isAnchored
     WeekOfMonth.onOffset
@@ -622,6 +628,7 @@ Methods
    :toctree: api/
 
     LastWeekOfMonth.apply
+    LastWeekOfMonth.apply_index
     LastWeekOfMonth.copy
     LastWeekOfMonth.isAnchored
     LastWeekOfMonth.onOffset
@@ -938,6 +945,7 @@ Methods
    :toctree: api/
 
     FY5253.apply
+    FY5253.apply_index
     FY5253.copy
     FY5253.get_rule_code_suffix
     FY5253.get_year_end
@@ -977,6 +985,7 @@ Methods
    :toctree: api/
 
     FY5253Quarter.apply
+    FY5253Quarter.apply_index
     FY5253Quarter.copy
     FY5253Quarter.get_rule_code_suffix
     FY5253Quarter.get_weeks
@@ -1013,6 +1022,7 @@ Methods
    :toctree: api/
 
     Easter.apply
+    Easter.apply_index
     Easter.copy
     Easter.isAnchored
     Easter.onOffset
@@ -1053,6 +1063,7 @@ Methods
     Tick.is_on_offset
     Tick.__call__
     Tick.apply
+    Tick.apply_index
 
 Day
 ---
@@ -1087,6 +1098,7 @@ Methods
     Day.is_on_offset
     Day.__call__
     Day.apply
+    Day.apply_index
 
 Hour
 ----
@@ -1121,6 +1133,7 @@ Methods
     Hour.is_on_offset
     Hour.__call__
     Hour.apply
+    Hour.apply_index
 
 Minute
 ------
@@ -1155,6 +1168,7 @@ Methods
     Minute.is_on_offset
     Minute.__call__
     Minute.apply
+    Minute.apply_index
 
 Second
 ------
@@ -1189,6 +1203,7 @@ Methods
     Second.is_on_offset
     Second.__call__
     Second.apply
+    Second.apply_index
 
 Milli
 -----
@@ -1223,6 +1238,7 @@ Methods
     Milli.is_on_offset
     Milli.__call__
     Milli.apply
+    Milli.apply_index
 
 Micro
 -----
@@ -1257,6 +1273,7 @@ Methods
     Micro.is_on_offset
     Micro.__call__
     Micro.apply
+    Micro.apply_index
 
 Nano
 ----
@@ -1291,6 +1308,7 @@ Methods
     Nano.is_on_offset
     Nano.__call__
     Nano.apply
+    Nano.apply_index
 
 .. _api.frequencies:
 

doc/source/reference/window.rst

@@ -86,3 +86,4 @@ Base class for defining custom window boundaries.
 
    api.indexers.BaseIndexer
    api.indexers.FixedForwardWindowIndexer
+   api.indexers.VariableOffsetWindowIndexer

doc/source/user_guide/visualization.rst

@@ -1425,7 +1425,7 @@ Horizontal and vertical error bars can be supplied to the ``xerr`` and ``yerr``
 * As a ``str`` indicating which of the columns of plotting :class:`DataFrame` contain the error values.
 * As raw values (``list``, ``tuple``, or ``np.ndarray``). Must be the same length as the plotting :class:`DataFrame`/:class:`Series`.
 
-Asymmetrical error bars are also supported, however raw error values must be provided in this case. For a ``M`` length :class:`Series`, a ``Mx2`` array should be provided indicating lower and upper (or left and right) errors. For a ``MxN`` :class:`DataFrame`, asymmetrical errors should be in a ``Mx2xN`` array.
+Asymmetrical error bars are also supported, however raw error values must be provided in this case. For a ``N`` length :class:`Series`, a ``2xN`` array should be provided indicating lower and upper (or left and right) errors. For a ``MxN`` :class:`DataFrame`, asymmetrical errors should be in a ``Mx2xN`` array.
 
 Here is an example of one way to easily plot group means with standard deviations from the raw data.