merge in latest master

Author: Dr-Irv

doc/source/whatsnew/v0.24.0.txt

@@ -301,6 +301,7 @@ Datetimelike
 ^^^^^^^^^^^^
 
 - Fixed bug where two :class:`DateOffset` objects with different ``normalize`` attributes could evaluate as equal (:issue:`21404`)
+- Fixed bug where :meth:`Timestamp.resolution` incorrectly returned 1-microsecond ``timedelta`` instead of 1-nanosecond :class:`Timedelta` (:issue:`21336`,:issue:`21365`)
 
 Timedelta
 ^^^^^^^^^
@@ -369,6 +370,7 @@ Missing
 ^^^^^^^
 
 - Bug in :func:`DataFrame.fillna` where a ``ValueError`` would raise when one column contained a ``datetime64[ns, tz]`` dtype (:issue:`15522`)
+- Bug in :func:`Series.hasnans` that could be incorrectly cached and return incorrect answers if null elements are introduced after an initial call (:issue:`19700`)
 
 MultiIndex
 ^^^^^^^^^^
@@ -425,5 +427,6 @@ Other
 
 - :meth: `~pandas.io.formats.style.Styler.background_gradient` now takes a ``text_color_threshold`` parameter to automatically lighten the text color based on the luminance of the background color. This improves readability with dark background colors without the need to limit the background colormap range. (:issue:`21258`)
 - Require at least 0.28.2 version of ``cython`` to support read-only memoryviews (:issue:`21688`)
+- :meth: `~pandas.io.formats.style.Styler.background_gradient` now also supports tablewise application (in addition to rowwise and columnwise) with ``axis=None`` (:issue:`15204`)
 -
 -

pandas/_libs/__init__.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from .tslibs import iNaT, NaT, Timestamp, Timedelta, OutOfBoundsDatetime
-
-# TODO
-# period is directly dependent on tslib and imports python
-# modules, so exposing Period as an alias is currently not possible
-# from period import Period
+from .tslibs import (
+    iNaT, NaT, Timestamp, Timedelta, OutOfBoundsDatetime, Period)

pandas/_libs/index.pyx

@@ -43,9 +43,9 @@ cdef inline bint is_definitely_invalid_key(object val):
             or PyList_Check(val) or hasattr(val, '_data'))
 
 
-def get_value_at(ndarray arr, object loc):
+cpdef get_value_at(ndarray arr, object loc, object tz=None):
     if arr.descr.type_num == NPY_DATETIME:
-        return Timestamp(util.get_value_at(arr, loc))
+        return Timestamp(util.get_value_at(arr, loc), tz=tz)
     elif arr.descr.type_num == NPY_TIMEDELTA:
         return Timedelta(util.get_value_at(arr, loc))
     return util.get_value_at(arr, loc)
@@ -68,12 +68,7 @@ cpdef object get_value_box(ndarray arr, object loc):
     if i >= sz or sz == 0 or i < 0:
         raise IndexError('index out of bounds')
 
-    if arr.descr.type_num == NPY_DATETIME:
-        return Timestamp(util.get_value_1d(arr, i))
-    elif arr.descr.type_num == NPY_TIMEDELTA:
-        return Timedelta(util.get_value_1d(arr, i))
-    else:
-        return util.get_value_1d(arr, i)
+    return get_value_at(arr, i, tz=None)
 
 
 # Don't populate hash tables in monotonic indexes larger than this
@@ -114,11 +109,7 @@ cdef class IndexEngine:
         if PySlice_Check(loc) or cnp.PyArray_Check(loc):
             return arr[loc]
         else:
-            if arr.descr.type_num == NPY_DATETIME:
-                return Timestamp(util.get_value_at(arr, loc), tz=tz)
-            elif arr.descr.type_num == NPY_TIMEDELTA:
-                return Timedelta(util.get_value_at(arr, loc))
-            return util.get_value_at(arr, loc)
+            return get_value_at(arr, loc, tz=tz)
 
     cpdef set_value(self, ndarray arr, object key, object value):
         """

pandas/_libs/indexing.pyx

@@ -1,10 +1,10 @@
 # cython: profile=False
 
 cdef class _NDFrameIndexerBase:
-    '''
+    """
     A base class for _NDFrameIndexer for fast instantiation and attribute
     access.
-    '''
+    """
     cdef public object obj, name, _ndim
 
     def __init__(self, name, obj):

pandas/_libs/src/datetime/np_datetime.c

@@ -21,6 +21,7 @@ This file is derived from NumPy 1.7. See NUMPY_LICENSE.txt
 
 #include <numpy/arrayobject.h>
 #include <numpy/arrayscalars.h>
+#include <numpy/ndarraytypes.h>
 #include "np_datetime.h"
 
 #if PY_MAJOR_VERSION >= 3
@@ -511,21 +512,21 @@ int convert_pydatetime_to_datetimestruct(PyObject *obj,
     return -1;
 }
 
-npy_datetime pandas_datetimestruct_to_datetime(PANDAS_DATETIMEUNIT fr,
+npy_datetime pandas_datetimestruct_to_datetime(NPY_DATETIMEUNIT fr,
                                                pandas_datetimestruct *d) {
-    npy_datetime result = PANDAS_DATETIME_NAT;
+    npy_datetime result = NPY_DATETIME_NAT;
 
     convert_datetimestruct_to_datetime(fr, d, &result);
     return result;
 }
 
-void pandas_datetime_to_datetimestruct(npy_datetime val, PANDAS_DATETIMEUNIT fr,
+void pandas_datetime_to_datetimestruct(npy_datetime val, NPY_DATETIMEUNIT fr,
                                        pandas_datetimestruct *result) {
     convert_datetime_to_datetimestruct(fr, val, result);
 }
 
 void pandas_timedelta_to_timedeltastruct(npy_timedelta val,
-                                         PANDAS_DATETIMEUNIT fr,
+                                         NPY_DATETIMEUNIT fr,
                                          pandas_timedeltastruct *result) {
     convert_timedelta_to_timedeltastruct(fr, val, result);
 }
@@ -537,71 +538,71 @@ void pandas_timedelta_to_timedeltastruct(npy_timedelta val,
  *
  * Returns 0 on success, -1 on failure.
  */
-int convert_datetimestruct_to_datetime(PANDAS_DATETIMEUNIT base,
+int convert_datetimestruct_to_datetime(NPY_DATETIMEUNIT base,
                                        const pandas_datetimestruct *dts,
                                        npy_datetime *out) {
     npy_datetime ret;
 
-    if (base == PANDAS_FR_Y) {
+    if (base == NPY_FR_Y) {
         /* Truncate to the year */
         ret = dts->year - 1970;
-    } else if (base == PANDAS_FR_M) {
+    } else if (base == NPY_FR_M) {
         /* Truncate to the month */
         ret = 12 * (dts->year - 1970) + (dts->month - 1);
     } else {
         /* Otherwise calculate the number of days to start */
         npy_int64 days = get_datetimestruct_days(dts);
 
         switch (base) {
-            case PANDAS_FR_W:
+            case NPY_FR_W:
                 /* Truncate to weeks */
                 if (days >= 0) {
                     ret = days / 7;
                 } else {
                     ret = (days - 6) / 7;
                 }
                 break;
-            case PANDAS_FR_D:
+            case NPY_FR_D:
                 ret = days;
                 break;
-            case PANDAS_FR_h:
+            case NPY_FR_h:
                 ret = days * 24 + dts->hour;
                 break;
-            case PANDAS_FR_m:
+            case NPY_FR_m:
                 ret = (days * 24 + dts->hour) * 60 + dts->min;
                 break;
-            case PANDAS_FR_s:
+            case NPY_FR_s:
                 ret = ((days * 24 + dts->hour) * 60 + dts->min) * 60 + dts->sec;
                 break;
-            case PANDAS_FR_ms:
+            case NPY_FR_ms:
                 ret = (((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                        dts->sec) *
                           1000 +
                       dts->us / 1000;
                 break;
-            case PANDAS_FR_us:
+            case NPY_FR_us:
                 ret = (((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                        dts->sec) *
                           1000000 +
                       dts->us;
                 break;
-            case PANDAS_FR_ns:
+            case NPY_FR_ns:
                 ret = ((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                         dts->sec) *
                            1000000 +
                        dts->us) *
                           1000 +
                       dts->ps / 1000;
                 break;
-            case PANDAS_FR_ps:
+            case NPY_FR_ps:
                 ret = ((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                         dts->sec) *
                            1000000 +
                        dts->us) *
                           1000000 +
                       dts->ps;
                 break;
-            case PANDAS_FR_fs:
+            case NPY_FR_fs:
                 /* only 2.6 hours */
                 ret = (((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                          dts->sec) *
@@ -612,7 +613,7 @@ int convert_datetimestruct_to_datetime(PANDAS_DATETIMEUNIT base,
                           1000 +
                       dts->as / 1000;
                 break;
-            case PANDAS_FR_as:
+            case NPY_FR_as:
                 /* only 9.2 secs */
                 ret = (((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
                          dts->sec) *
@@ -640,7 +641,7 @@ int convert_datetimestruct_to_datetime(PANDAS_DATETIMEUNIT base,
 /*
  * Converts a datetime based on the given metadata into a datetimestruct
  */
-int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
+int convert_datetime_to_datetimestruct(NPY_DATETIMEUNIT base,
                                        npy_datetime dt,
                                        pandas_datetimestruct *out) {
     npy_int64 perday;
@@ -656,11 +657,11 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
      * for negative values.
      */
     switch (base) {
-        case PANDAS_FR_Y:
+        case NPY_FR_Y:
             out->year = 1970 + dt;
             break;
 
-        case PANDAS_FR_M:
+        case NPY_FR_M:
             if (dt >= 0) {
                 out->year = 1970 + dt / 12;
                 out->month = dt % 12 + 1;
@@ -670,16 +671,16 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             }
             break;
 
-        case PANDAS_FR_W:
+        case NPY_FR_W:
             /* A week is 7 days */
             set_datetimestruct_days(dt * 7, out);
             break;
 
-        case PANDAS_FR_D:
+        case NPY_FR_D:
             set_datetimestruct_days(dt, out);
             break;
 
-        case PANDAS_FR_h:
+        case NPY_FR_h:
             perday = 24LL;
 
             if (dt >= 0) {
@@ -693,7 +694,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->hour = dt;
             break;
 
-        case PANDAS_FR_m:
+        case NPY_FR_m:
             perday = 24LL * 60;
 
             if (dt >= 0) {
@@ -708,7 +709,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->min = dt % 60;
             break;
 
-        case PANDAS_FR_s:
+        case NPY_FR_s:
             perday = 24LL * 60 * 60;
 
             if (dt >= 0) {
@@ -724,7 +725,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->sec = dt % 60;
             break;
 
-        case PANDAS_FR_ms:
+        case NPY_FR_ms:
             perday = 24LL * 60 * 60 * 1000;
 
             if (dt >= 0) {
@@ -741,7 +742,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->us = (dt % 1000LL) * 1000;
             break;
 
-        case PANDAS_FR_us:
+        case NPY_FR_us:
             perday = 24LL * 60LL * 60LL * 1000LL * 1000LL;
 
             if (dt >= 0) {
@@ -758,7 +759,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->us = dt % 1000000LL;
             break;
 
-        case PANDAS_FR_ns:
+        case NPY_FR_ns:
             perday = 24LL * 60LL * 60LL * 1000LL * 1000LL * 1000LL;
 
             if (dt >= 0) {
@@ -776,7 +777,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->ps = (dt % 1000LL) * 1000;
             break;
 
-        case PANDAS_FR_ps:
+        case NPY_FR_ps:
             perday = 24LL * 60 * 60 * 1000 * 1000 * 1000 * 1000;
 
             if (dt >= 0) {
@@ -794,7 +795,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             out->ps = dt % 1000000LL;
             break;
 
-        case PANDAS_FR_fs:
+        case NPY_FR_fs:
             /* entire range is only +- 2.6 hours */
             if (dt >= 0) {
                 out->hour = dt / (60 * 60 * 1000000000000000LL);
@@ -821,7 +822,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
             }
             break;
 
-        case PANDAS_FR_as:
+        case NPY_FR_as:
             /* entire range is only +- 9.2 seconds */
             if (dt >= 0) {
                 out->sec = (dt / 1000000000000000000LL) % 60;
@@ -861,7 +862,7 @@ int convert_datetime_to_datetimestruct(PANDAS_DATETIMEUNIT base,
  *
  * Returns 0 on success, -1 on failure.
  */
-int convert_timedelta_to_timedeltastruct(PANDAS_DATETIMEUNIT base,
+int convert_timedelta_to_timedeltastruct(NPY_DATETIMEUNIT base,
                                          npy_timedelta td,
                                          pandas_timedeltastruct *out) {
     npy_int64 frac;
@@ -874,7 +875,7 @@ int convert_timedelta_to_timedeltastruct(PANDAS_DATETIMEUNIT base,
     memset(out, 0, sizeof(pandas_timedeltastruct));
 
     switch (base) {
-        case PANDAS_FR_ns:
+        case NPY_FR_ns:
 
         // put frac in seconds
         if (td < 0 && td % (1000LL * 1000LL * 1000LL) != 0)