Merge remote-tracking branch 'upstream/master' into factorize-na-sent…

…inel2
pandas-dev · jreback · May 7, 2019 · Mar 7, 2019 · Mar 11, 2019 · Mar 11, 2019
commit 5157e89e4a79bd9e942dd6248657f36c64a167b0
diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst
@@ -427,10 +427,8 @@ Sparse
 Other
 ^^^^^
 
-- Improved :class:`Timestamp` type checking in various datetime functions to prevent exceptions when using a subclassed `datetime` (:issue:`25851`)
-- Bug in :class:`Series` and :class:`DataFrame` repr where ``np.datetime64('NaT')`` and ``np.timedelta64('NaT')`` with ``dtype=object`` would be represented as ``NaN`` (:issue:`25445`)
+- Removed unused C functions from vendored UltraJSON implementation (:issue:`26198`)
 - Bug in :func:`factorize` when passing an ``ExtensionArray`` with a custom ``na_sentinel`` (:issue:`25696`). 
--
 
 
 .. _whatsnew_0.250.contributors:

diff --git a/pandas/tests/test_sorting.py b/pandas/tests/test_sorting.py
@@ -7,7 +7,7 @@
 import pytest
 
 from pandas import (
-    DataFrame, MultiIndex, Series, array, compat, concat, merge, to_datetime)
+    DataFrame, MultiIndex, Series, array, concat, merge, to_datetime)
 from pandas.core import common as com
 from pandas.core.sorting import (
     decons_group_index, get_group_index, is_int64_overflow_possible,