Merge remote-tracking branch 'upstream/master' into format_np_nat_object

Author: Matt Roeschke

ci/deps/azure-27-compat.yaml

@@ -21,6 +21,7 @@ dependencies:
   - pytest
   - pytest-xdist
   - pytest-mock
+  - isort
   - pip:
     - html5lib==1.0b2
     - beautifulsoup4==4.2.1

ci/deps/azure-27-locale.yaml

@@ -24,6 +24,7 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - hypothesis>=3.58.0
+  - isort
   - pip:
     - html5lib==1.0b2
     - beautifulsoup4==4.2.1

ci/deps/azure-36-locale_slow.yaml

@@ -30,5 +30,6 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - moto
+  - isort
   - pip:
     - hypothesis>=3.58.0

ci/deps/azure-37-locale.yaml

@@ -28,6 +28,7 @@ dependencies:
   - pytest
   - pytest-xdist
   - pytest-mock
+  - isort
   - pip:
     - hypothesis>=3.58.0
     - moto  # latest moto in conda-forge fails with 3.7, move to conda dependencies when this is fixed

ci/deps/azure-37-numpydev.yaml

@@ -10,6 +10,7 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - hypothesis>=3.58.0
+  - isort
   - pip:
     - "git+git://github.com/dateutil/dateutil.git"
     - "-f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"

ci/deps/azure-macos-35.yaml

@@ -25,6 +25,7 @@ dependencies:
   - pytest
   - pytest-xdist
   - pytest-mock
+  - isort
   - pip:
     - python-dateutil==2.5.3
     - hypothesis>=3.58.0

ci/deps/azure-windows-27.yaml

@@ -30,3 +30,4 @@ dependencies:
   - pytest-mock
   - moto
   - hypothesis>=3.58.0
+  - isort

ci/deps/azure-windows-36.yaml

@@ -27,3 +27,4 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - hypothesis>=3.58.0
+  - isort

ci/deps/travis-27.yaml

@@ -44,6 +44,7 @@ dependencies:
   - pytest-mock
   - moto==1.3.4
   - hypothesis>=3.58.0
+  - isort
   - pip:
     - backports.lzma
     - pandas-gbq

ci/deps/travis-36-doc.yaml

@@ -43,3 +43,4 @@ dependencies:
   # universal
   - pytest
   - pytest-xdist
+  - isort

ci/deps/travis-36-locale.yaml

@@ -32,5 +32,6 @@ dependencies:
   - pytest-xdist
   - pytest-mock
   - moto
+  - isort
   - pip:
     - hypothesis>=3.58.0

ci/deps/travis-36-slow.yaml

@@ -30,3 +30,4 @@ dependencies:
   - pytest-mock
   - moto
   - hypothesis>=3.58.0
+  - isort

ci/deps/travis-36.yaml

@@ -38,6 +38,7 @@ dependencies:
   - pytest-cov
   - pytest-mock
   - hypothesis>=3.58.0
+  - isort
   - pip:
     - brotlipy
     - coverage

ci/deps/travis-37.yaml

@@ -17,5 +17,6 @@ dependencies:
   - pytest-mock
   - hypothesis>=3.58.0
   - s3fs
+  - isort
   - pip:
     - moto

pandas/core/indexes/category.py

@@ -42,20 +42,35 @@
     typ='method', overwrite=True)
 class CategoricalIndex(Index, accessor.PandasDelegate):
     """
-    Immutable Index implementing an ordered, sliceable set. CategoricalIndex
-    represents a sparsely populated Index with an underlying Categorical.
+    Index based on an underlying :class:`Categorical`.
+
+    CategoricalIndex, like Categorical, can only take on a limited,
+    and usually fixed, number of possible values (`categories`). Also,
+    like Categorical, it might have an order, but numerical operations
+    (additions, divisions, ...) are not possible.
 
     Parameters
     ----------
-    data : array-like or Categorical, (1-dimensional)
-    categories : optional, array-like
-        categories for the CategoricalIndex
-    ordered : boolean,
-        designating if the categories are ordered
-    copy : bool
-        Make a copy of input ndarray
-    name : object
-        Name to be stored in the index
+    data : array-like (1-dimensional)
+        The values of the categorical. If `categories` are given, values not in
+        `categories` will be replaced with NaN.
+    categories : index-like, optional
+        The categories for the categorical. Items need to be unique.
+        If the categories are not given here (and also not in `dtype`), they
+        will be inferred from the `data`.
+    ordered : bool, optional
+        Whether or not this categorical is treated as an ordered
+        categorical. If not given here or in `dtype`, the resulting
+        categorical will be unordered.
+    dtype : CategoricalDtype or the string "category", optional
+        If :class:`CategoricalDtype`, cannot be used together with
+        `categories` or `ordered`.
+
+        .. versionadded:: 0.21.0
+    copy : bool, default False
+        Make a copy of input ndarray.
+    name : object, optional
+        Name to be stored in the index.
 
     Attributes
     ----------
@@ -75,9 +90,45 @@ class CategoricalIndex(Index, accessor.PandasDelegate):
     as_unordered
     map
 
+    Raises
+    ------
+    ValueError
+        If the categories do not validate.
+    TypeError
+        If an explicit ``ordered=True`` is given but no `categories` and the
+        `values` are not sortable.
+
     See Also
     --------
-    Categorical, Index
+    Index : The base pandas Index type.
+    Categorical : A categorical array.
+    CategoricalDtype : Type for categorical data.
+
+    Notes
+    -----
+    See the `user guide
+    <http://pandas.pydata.org/pandas-docs/stable/user_guide/advanced.html#categoricalindex>`_
+    for more.
+
+    Examples
+    --------
+    >>> pd.CategoricalIndex(['a', 'b', 'c', 'a', 'b', 'c'])
+    CategoricalIndex(['a', 'b', 'c', 'a', 'b', 'c'], categories=['a', 'b', 'c'], ordered=False, dtype='category')  # noqa
+
+    ``CategoricalIndex`` can also be instantiated from a ``Categorical``:
+
+    >>> c = pd.Categorical(['a', 'b', 'c', 'a', 'b', 'c'])
+    >>> pd.CategoricalIndex(c)
+    CategoricalIndex(['a', 'b', 'c', 'a', 'b', 'c'], categories=['a', 'b', 'c'], ordered=False, dtype='category')  # noqa
+
+    Ordered ``CategoricalIndex`` can have a min and max value.
+
+    >>> ci = pd.CategoricalIndex(['a','b','c','a','b','c'], ordered=True,
+    ...                          categories=['c', 'b', 'a'])
+    >>> ci
+    CategoricalIndex(['a', 'b', 'c', 'a', 'b', 'c'], categories=['c', 'b', 'a'], ordered=True, dtype='category')  # noqa
+    >>> ci.min()
+    'c'
     """
 
     _typ = 'categoricalindex'

setup.cfg

@@ -152,3 +152,23 @@ skip=
     asv_bench/benchmarks/dtypes.py
     asv_bench/benchmarks/strings.py
     asv_bench/benchmarks/period.py
+    pandas/__init__.py
+    pandas/plotting/__init__.py
+    pandas/tests/extension/decimal/__init__.py
+    pandas/tests/extension/base/__init__.py
+    pandas/io/msgpack/__init__.py
+    pandas/io/json/__init__.py
+    pandas/io/clipboard/__init__.py
+    pandas/io/excel/__init__.py
+    pandas/compat/__init__.py
+    pandas/compat/numpy/__init__.py
+    pandas/core/arrays/__init__.py
+    pandas/core/groupby/__init__.py
+    pandas/core/internals/__init__.py
+    pandas/api/__init__.py
+    pandas/api/extensions/__init__.py
+    pandas/api/types/__init__.py
+    pandas/_libs/__init__.py
+    pandas/_libs/tslibs/__init__.py
+    pandas/util/__init__.py
+    pandas/arrays/__init__.py