Merge remote-tracking branch 'upstream/master' into boolean-array

Author: linxiaow

ci/code_checks.sh

@@ -268,6 +268,10 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
 
     # Individual files
 
+    MSG='Doctests accessor.py' ; echo $MSG
+    pytest -q --doctest-modules pandas/core/accessor.py
+    RET=$(($RET + $?)) ; echo $MSG "DONE"
+
     MSG='Doctests base.py' ; echo $MSG
     pytest -q --doctest-modules pandas/core/base.py
     RET=$(($RET + $?)) ; echo $MSG "DONE"

pandas/core/accessor.py

@@ -257,12 +257,13 @@ def plot(self):
 
     Back in an interactive IPython session:
 
-        >>> ds = pd.DataFrame({{'longitude': np.linspace(0, 10),
-        ...                    'latitude': np.linspace(0, 20)}})
-        >>> ds.geo.center
-        (5.0, 10.0)
-        >>> ds.geo.plot()
-        # plots data on a map
+        .. code-block:: ipython
+
+            In [1]: ds = pd.DataFrame({{"longitude": np.linspace(0, 10),
+               ...:                    "latitude": np.linspace(0, 20)}})
+            In [2]: ds.geo.center
+            Out[2]: (5.0, 10.0)
+            In [3]: ds.geo.plot()  # plots data on a map
     """
 
     def decorator(accessor):

pandas/tests/io/json/test_pandas.py

@@ -15,6 +15,16 @@
 from pandas import DataFrame, DatetimeIndex, Series, Timestamp, read_json
 import pandas._testing as tm
 
+_seriesd = tm.getSeriesData()
+
+_frame = DataFrame(_seriesd)
+
+_cat_frame = _frame.copy()
+cat = ["bah"] * 5 + ["bar"] * 5 + ["baz"] * 5 + ["foo"] * (len(_cat_frame) - 15)
+_cat_frame.index = pd.CategoricalIndex(cat, name="E")
+_cat_frame["E"] = list(reversed(cat))
+_cat_frame["sort"] = np.arange(len(_cat_frame), dtype="int64")
+
 
 def assert_json_roundtrip_equal(result, expected, orient):
     if orient == "records" or orient == "values":
@@ -26,6 +36,12 @@ def assert_json_roundtrip_equal(result, expected, orient):
 
 @pytest.mark.filterwarnings("ignore:the 'numpy' keyword is deprecated:FutureWarning")
 class TestPandasContainer:
+    @pytest.fixture(autouse=True)
+    def setup(self):
+        self.categorical = _cat_frame.copy()
+
+        yield
+
     def test_frame_double_encoded_labels(self, orient):
         df = DataFrame(
             [["a", "b"], ["c", "d"]],
@@ -167,21 +183,25 @@ def test_roundtrip_str_axes(self, orient, convert_axes, numpy, dtype):
     @pytest.mark.parametrize("convert_axes", [True, False])
     @pytest.mark.parametrize("numpy", [True, False])
     def test_roundtrip_categorical(self, orient, convert_axes, numpy):
-        cats = ["a", "b"]
-        df = pd.DataFrame(
-            pd.Categorical(cats), index=pd.CategoricalIndex(cats), columns=["cat"]
-        )
+        # TODO: create a better frame to test with and improve coverage
+        if orient in ("index", "columns"):
+            pytest.xfail(f"Can't have duplicate index values for orient '{orient}')")
 
-        data = df.to_json(orient=orient)
-        if numpy and orient != "split":
+        data = self.categorical.to_json(orient=orient)
+        if numpy and orient in ("records", "values"):
             pytest.xfail(f"Orient {orient} is broken with numpy=True")
 
         result = pd.read_json(
             data, orient=orient, convert_axes=convert_axes, numpy=numpy
         )
 
-        # Categorical dtypes are not preserved on round trip
-        expected = pd.DataFrame(cats, index=cats, columns=["cat"])
+        expected = self.categorical.copy()
+        expected.index = expected.index.astype(str)  # Categorical not preserved
+        expected.index.name = None  # index names aren't preserved in JSON
+
+        if not numpy and orient == "index":
+            expected = expected.sort_index()
+
         assert_json_roundtrip_equal(result, expected, orient)
 
     @pytest.mark.parametrize("convert_axes", [True, False])