Merge branch 'master' into PR_TOOL_MERGE_PR_20789

Author: jreback

.travis.yml

@@ -34,55 +34,54 @@ matrix:
     - os: osx
       language: generic
       env:
-        - JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
+        - JOB="3.5, OSX" ENV_FILE="ci/travis-35-osx.yaml" TEST_ARGS="--skip-slow --skip-network"
     - dist: trusty
       env:
-        - JOB="2.7_LOCALE" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
+        - JOB="2.7, locale, slow, old NumPy" ENV_FILE="ci/travis-27-locale.yaml" LOCALE_OVERRIDE="zh_CN.UTF-8" SLOW=true
       addons:
         apt:
           packages:
           - language-pack-zh-hans
     - dist: trusty
       env:
-        - JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
+        - JOB="2.7, lint" ENV_FILE="ci/travis-27.yaml" TEST_ARGS="--skip-slow" LINT=true
       addons:
         apt:
           packages:
           - python-gtk2
-    # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
+        - JOB="3.6, coverage" ENV_FILE="ci/travis-36.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_SLOW" SLOW=true
+        - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+        - JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
       addons:
         apt:
           packages:
           - xsel
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_DOC" DOC=true
+        - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
     allow_failures:
       - dist: trusty
         env:
-          - JOB="3.6_SLOW" SLOW=true
+          - JOB="3.6, slow" ENV_FILE="ci/travis-36-slow.yaml" SLOW=true
       - dist: trusty
         env:
-          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+          - JOB="3.6, NumPy dev" ENV_FILE="ci/travis-36-numpydev.yaml" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
         addons:
           apt:
             packages:
             - xsel
       - dist: trusty
         env:
-          - JOB="3.6_DOC" DOC=true
+          - JOB="3.6, doc" ENV_FILE="ci/travis-36-doc.yaml" DOC=true
 
 before_install:
   - echo "before_install"

README.md

@@ -10,7 +10,7 @@
 <tr>
   <td>Latest Release</td>
   <td>
-    <a href="https://pypi.python.org/pypi/pandas/">
+    <a href="https://pypi.org/project/pandas/">
     <img src="https://img.shields.io/pypi/v/pandas.svg" alt="latest release" />
     </a>
   </td>
@@ -25,7 +25,7 @@
 <tr>
   <td>Package Status</td>
   <td>
-		<a href="https://pypi.python.org/pypi/pandas/">
+		<a href="https://pypi.org/project/pandas/">
 		<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" /></td>
 		</a>
 </tr>
@@ -158,7 +158,7 @@ The source code is currently hosted on GitHub at:
 https://github.com/pandas-dev/pandas
 
 Binary installers for the latest released version are available at the [Python
-package index](https://pypi.python.org/pypi/pandas) and on conda.
+package index](https://pypi.org/project/pandas) and on conda.
 
 ```sh
 # conda

appveyor.yml

@@ -73,19 +73,12 @@ install:
   - cmd: conda info -a
 
   # create our env
-  - cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist
+  - cmd: conda env create -q -n pandas --file=ci\appveyor-%CONDA_PY%.yaml
   - cmd: activate pandas
-  - cmd: pip install moto
-  - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run
-  - cmd: echo "installing requirements from %REQ%"
-  - cmd: conda install -n pandas --file=%REQ%
   - cmd: conda list -n pandas
-  - cmd: echo "installing requirements from %REQ% - done"
-
-  # add some pip only reqs to the env
-  - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.pip
-  - cmd: echo "installing requirements from %REQ%"
-  - cmd: pip install -Ur %REQ%
+  # uninstall pandas if it's present
+  - cmd: conda remove pandas -y --force & exit 0
+  - cmd: pip uninstall -y pandas & exit 0
 
   # build em using the local source checkout in the correct windows env
   - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace'

asv_bench/benchmarks/categoricals.py

@@ -148,3 +148,24 @@ def time_rank_int_cat(self):
 
     def time_rank_int_cat_ordered(self):
         self.s_int_cat_ordered.rank()
+
+
+class Isin(object):
+
+    goal_time = 0.2
+
+    params = ['object', 'int64']
+    param_names = ['dtype']
+
+    def setup(self, dtype):
+        np.random.seed(1234)
+        n = 5 * 10**5
+        sample_size = 100
+        arr = [i for i in np.random.randint(0, n // 10, size=n)]
+        if dtype == 'object':
+            arr = ['s%04d' % i for i in arr]
+        self.sample = np.random.choice(arr, sample_size)
+        self.series = pd.Series(arr).astype('category')
+
+    def time_isin_categorical(self, dtype):
+        self.series.isin(self.sample)

asv_bench/benchmarks/rolling.py

@@ -22,6 +22,7 @@ def setup(self, constructor, window, dtype, method):
     def time_rolling(self, constructor, window, dtype, method):
         getattr(self.roll, method)()
 
+
 class VariableWindowMethods(Methods):
     sample_time = 0.2
     params = (['DataFrame', 'Series'],
@@ -37,6 +38,7 @@ def setup(self, constructor, window, dtype, method):
         index = pd.date_range('2017-01-01', periods=N, freq='5s')
         self.roll = getattr(pd, constructor)(arr, index=index).rolling(window)
 
+
 class Pairwise(object):
 
     sample_time = 0.2
@@ -59,18 +61,19 @@ def time_pairwise(self, window, method, pairwise):
 
 
 class Quantile(object):
-
     sample_time = 0.2
     params = (['DataFrame', 'Series'],
               [10, 1000],
               ['int', 'float'],
-              [0, 0.5, 1])
+              [0, 0.5, 1],
+              ['linear', 'nearest', 'lower', 'higher', 'midpoint'])
     param_names = ['constructor', 'window', 'dtype', 'percentile']
 
-    def setup(self, constructor, window, dtype, percentile):
-        N = 10**5
+    def setup(self, constructor, window, dtype, percentile, interpolation):
+        N = 10 ** 5
         arr = np.random.random(N).astype(dtype)
         self.roll = getattr(pd, constructor)(arr).rolling(window)
 
-    def time_quantile(self, constructor, window, dtype, percentile):
-        self.roll.quantile(percentile)
+    def time_quantile(self, constructor, window, dtype, percentile,
+                      interpolation):
+        self.roll.quantile(percentile, interpolation=interpolation)

asv_bench/benchmarks/series_methods.py

@@ -121,3 +121,16 @@ def setup(self):
 
     def time_dir_strings(self):
         dir(self.s)
+
+
+class SeriesGetattr(object):
+    # https://github.com/pandas-dev/pandas/issues/19764
+    goal_time = 0.2
+
+    def setup(self):
+        self.s = Series(1,
+                        index=date_range("2012-01-01", freq='s',
+                                         periods=int(1e6)))
+
+    def time_series_datetimeindex_repr(self):
+        getattr(self.s, 'a', None)

ci/appveyor-27.yaml

@@ -0,0 +1,29 @@
+name: pandas
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4
+  - bottleneck
+  - dateutil
+  - html5lib
+  - jinja2=2.8
+  - lxml
+  - matplotlib
+  - numexpr
+  - numpy=1.10*
+  - openpyxl
+  - pytables==3.2.2
+  - python=2.7.*
+  - pytz
+  - s3fs
+  - scipy
+  - sqlalchemy
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - cython
+  - pytest
+  - pytest-xdist
+  - moto

ci/appveyor-36.yaml

@@ -0,0 +1,27 @@
+name: pandas
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - blosc
+  - bottleneck
+  - fastparquet
+  - feather-format
+  - matplotlib
+  - numexpr
+  - numpy=1.13*
+  - openpyxl
+  - pyarrow
+  - pytables
+  - python-dateutil
+  - python=3.6.*
+  - pytz
+  - scipy
+  - thrift=0.10*
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - cython
+  - pytest
+  - pytest-xdist

ci/circle-27-compat.yaml

@@ -0,0 +1,28 @@
+name: pandas
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - bottleneck=1.0.0
+  - cython=0.24
+  - jinja2=2.8
+  - numexpr=2.4.4 # we test that we correctly don't use an unsupported numexpr
+  - numpy=1.9.2
+  - openpyxl
+  - psycopg2
+  - pytables=3.2.2
+  - python-dateutil=2.5.0
+  - python=2.7*
+  - pytz=2013b
+  - scipy=0.14.0
+  - sqlalchemy=0.7.8
+  - xlrd=0.9.2
+  - xlsxwriter=0.5.2
+  - xlwt=0.7.5
+  # universal
+  - pytest
+  - pytest-xdist
+  - pip:
+    - html5lib==1.0b2
+    - beautifulsoup4==4.2.1
+    - pymysql==0.6.0

ci/circle-35-ascii.yaml

@@ -0,0 +1,13 @@
+name: pandas
+channels:
+  - defaults
+dependencies:
+  - cython
+  - nomkl
+  - numpy
+  - python-dateutil
+  - python=3.5*
+  - pytz
+  # universal
+  - pytest
+  - pytest-xdist

ci/circle-36-locale.yaml

@@ -0,0 +1,33 @@
+name: pandas
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4
+  - cython
+  - html5lib
+  - ipython
+  - jinja2
+  - lxml
+  - matplotlib
+  - nomkl
+  - numexpr
+  - numpy
+  - openpyxl
+  - psycopg2
+  - pymysql
+  - pytables
+  - python-dateutil
+  - python=3.6*
+  - pytz
+  - s3fs
+  - scipy
+  - sqlalchemy
+  - xarray
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - pytest
+  - pytest-xdist
+  - moto

ci/circle-36-locale_slow.yaml

@@ -0,0 +1,33 @@
+name: pandas
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - beautifulsoup4
+  - cython
+  - html5lib
+  - ipython
+  - jinja2
+  - lxml
+  - matplotlib
+  - nomkl
+  - numexpr
+  - numpy
+  - openpyxl
+  - psycopg2
+  - pymysql
+  - pytables
+  - python-dateutil
+  - python=3.6*
+  - pytz
+  - s3fs
+  - scipy
+  - sqlalchemy
+  - xarray
+  - xlrd
+  - xlsxwriter
+  - xlwt
+  # universal
+  - pytest
+  - pytest-xdist
+  - moto