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

Author: How Si Wei

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://pandas.pydata.org/donate.html

.travis.yml

@@ -51,14 +51,14 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
+        - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
     allow_failures:
       - dist: trusty
         env:
           - JOB="3.6, slow" ENV_FILE="ci/deps/travis-36-slow.yaml" PATTERN="slow"
       - dist: trusty
         env:
-          - JOB="3.6, doc" ENV_FILE="environment.yml" DOC=true
+          - JOB="3.6, doc" ENV_FILE="ci/deps/travis-36-doc.yaml" DOC=true
 
 before_install:
   - echo "before_install"
@@ -103,10 +103,5 @@ script:
 after_script:
   - echo "after_script start"
   - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
-  - if [ -e test-data-single.xml ]; then
-        ci/print_skipped.py test-data-single.xml;
-    fi
-  - if [ -e test-data-multiple.xml ]; then
-        ci/print_skipped.py test-data-multiple.xml;
-    fi
+  - ci/print_skipped.py 
   - echo "after_script done"

asv_bench/asv.conf.json

@@ -107,7 +107,7 @@
     // `asv` will cache wheels of the recent builds in each
     // environment, making them faster to install next time.  This is
     // number of builds to keep, per environment.
-    "wheel_cache_size": 8,
+    "build_cache_size": 8,
 
     // The commits after which the regression search in `asv publish`
     // should start looking for regressions. Dictionary whose keys are

asv_bench/benchmarks/index_object.py

@@ -188,19 +188,34 @@ def time_get_loc(self):
 
 class IntervalIndexMethod:
     # GH 24813
-    params = [10**3, 10**5, 10**7]
+    params = [10**3, 10**5]
 
     def setup(self, N):
         left = np.append(np.arange(N), np.array(0))
         right = np.append(np.arange(1, N + 1), np.array(1))
         self.intv = IntervalIndex.from_arrays(left, right)
         self.intv._engine
 
+        self.intv2 = IntervalIndex.from_arrays(left + 1, right + 1)
+        self.intv2._engine
+
+        self.left = IntervalIndex.from_breaks(np.arange(N))
+        self.right = IntervalIndex.from_breaks(np.arange(N - 3, 2 * N - 3))
+
     def time_monotonic_inc(self, N):
         self.intv.is_monotonic_increasing
 
     def time_is_unique(self, N):
         self.intv.is_unique
 
+    def time_intersection(self, N):
+        self.left.intersection(self.right)
+
+    def time_intersection_one_duplicate(self, N):
+        self.intv.intersection(self.right)
+
+    def time_intersection_both_duplicate(self, N):
+        self.intv.intersection(self.intv2)
+
 
 from .pandas_vb_common import setup  # noqa: F401

asv_bench/benchmarks/multiindex_object.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 import pandas.util.testing as tm
-from pandas import date_range, MultiIndex
+from pandas import date_range, MultiIndex, DataFrame
 
 
 class GetLoc:
@@ -126,4 +126,18 @@ def time_datetime_level_values_sliced(self, mi):
         mi[:10].values
 
 
+class CategoricalLevel:
+
+    def setup(self):
+
+        self.df = DataFrame({
+            'a': np.arange(1_000_000, dtype=np.int32),
+            'b': np.arange(1_000_000, dtype=np.int64),
+            'c': np.arange(1_000_000, dtype=float),
+        }).astype({'a': 'category', 'b': 'category'})
+
+    def time_categorical_level(self):
+        self.df.set_index(['a', 'b'])
+
+
 from .pandas_vb_common import setup  # noqa: F401

asv_bench/benchmarks/timeseries.py

@@ -5,7 +5,7 @@
 from pandas import to_datetime, date_range, Series, DataFrame, period_range
 from pandas.tseries.frequencies import infer_freq
 try:
-    from pandas.plotting._converter import DatetimeConverter
+    from pandas.plotting._matplotlib.converter import DatetimeConverter
 except ImportError:
     from pandas.tseries.converter import DatetimeConverter
 

ci/azure/posix.yml

@@ -89,4 +89,9 @@ jobs:
           # note that this will produce $LASTEXITCODE=1
           Write-Error "$($matches[1]) tests failed"
         }
-      displayName: Check for test failures
+      displayName: 'Check for test failures'
+    - script: |
+        export PATH=$HOME/miniconda3/bin:$PATH
+        source activate pandas-dev
+        python ci/print_skipped.py
+      displayName: 'Print skipped tests'

ci/azure/windows.yml

@@ -18,11 +18,11 @@ jobs:
 
   steps:
     - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
-      displayName: Add conda to PATH
+      displayName: 'Add conda to PATH'
     - script: conda update -q -n base conda
       displayName: Update conda
     - script: conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
-      displayName: Create anaconda environment
+      displayName: 'Create anaconda environment'
     - script: |
         call activate pandas-dev
         call conda list
@@ -48,4 +48,9 @@ jobs:
           # note that this will produce $LASTEXITCODE=1
           Write-Error "$($matches[1]) tests failed"
         }
-      displayName: Check for test failures
+      displayName: 'Check for test failures'
+    - script: |
+        export PATH=$HOME/miniconda3/bin:$PATH
+        source activate pandas-dev
+        python ci/print_skipped.py
+      displayName: 'Print skipped tests'

ci/deps/azure-35-compat.yaml

@@ -22,7 +22,6 @@ dependencies:
   - hypothesis>=3.58.0
   - pytest-xdist
   - pytest-mock
-  - isort
   - pip
   - pip:
     # for python 3.5, pytest>=4.0.2 is not available in conda

ci/deps/azure-36-locale.yaml

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