Merge branch 'master' into excel_style

Author: jnothman

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
  - [ ] closes #xxxx
  - [ ] tests added / passed
- - [ ] passes ``git diff upstream/master | flake8 --diff``
+ - [ ] passes ``git diff upstream/master --name-only -- '*.py' | flake8 --diff``
  - [ ] whatsnew entry

.travis.yml

@@ -1,14 +1,16 @@
 sudo: false
 language: python
+# Default Python version is usually 2.7
+python: 3.5
 
-# To turn off cached miniconda, cython files and compiler cache comment out the
-# USE_CACHE=true line for the build in the matrix below. To delete caches go to
-# https://travis-ci.org/OWNER/REPOSITORY/caches or run
+# To turn off cached cython files and compiler cache
+# set NOCACHE-true
+# To delete caches go to https://travis-ci.org/OWNER/REPOSITORY/caches or run
 # travis cache --delete inside the project directory from the travis command line client
 # The cash directories will be deleted if anything in ci/ changes in a commit
 cache:
+ ccache: true
  directories:
-  - $HOME/miniconda # miniconda cache
   - $HOME/.cache # cython cache
   - $HOME/.ccache # compiler cache
 
@@ -24,188 +26,88 @@ git:
 
 matrix:
     fast_finish: true
+    exclude:
+      # Exclude the default Python 3.5 build
+      - python: 3.5
     include:
-    - language: objective-c
-      os: osx
-      compiler: clang
-      osx_image: xcode6.4
+    - os: osx
+      language: generic
       env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_osx"
-        - TEST_ARGS="--skip-slow --skip-network"
-        - BUILD_TYPE=conda
-        - JOB_TAG=_OSX
-        - TRAVIS_PYTHON_VERSION=3.5
-        - CACHE_NAME="35_osx"
-        - USE_CACHE=true
-    - python: 2.7
+        - JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
+    - os: linux
       env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_slow_nnet_LOCALE"
-        - TEST_ARGS="--only-slow --skip-network"
-        - LOCALE_OVERRIDE="zh_CN.UTF-8"
-        - FULL_DEPS=true
-        - JOB_TAG=_LOCALE
-        - CACHE_NAME="27_slow_nnet_LOCALE"
-        - USE_CACHE=true
+        - JOB="2.7_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8"
       addons:
         apt:
           packages:
           - language-pack-zh-hans
-    - python: 2.7
+    - os: linux
       env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_nslow"
-        - TEST_ARGS="--skip-slow"
-        - FULL_DEPS=true
-        - CLIPBOARD_GUI=gtk2
-        - LINT=true
-        - CACHE_NAME="27_nslow"
-        - USE_CACHE=true
+        - JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
       addons:
         apt:
           packages:
           - python-gtk2
-    - python: 3.5
+    - os: linux
       env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_nslow"
-        - TEST_ARGS="--skip-slow --skip-network"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - COVERAGE=true
-        - CACHE_NAME="35_nslow"
-#        - USE_CACHE=true # Don't use cache for 35_nslow
+        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
       addons:
         apt:
           packages:
           - xsel
-    - python: 3.6
+    - os: linux
       env:
-        - PYTHON_VERSION=3.6
-        - JOB_NAME: "36"
-        - TEST_ARGS="--skip-slow --skip-network"
-        - PANDAS_TESTING_MODE="deprecate"
-      addons:
-        apt:
-          packages:
-          - libatlas-base-dev
-          - gfortran
-#    In allow_failures
-    - python: 2.7
+        - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
+    # In allow_failures
+    - os: linux
       env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_slow"
-        - JOB_TAG=_SLOW
-        - TEST_ARGS="--only-slow --skip-network"
-        - FULL_DEPS=true
-        - CACHE_NAME="27_slow"
-        - USE_CACHE=true
-#    In allow_failures
-    - python: 2.7
+        - JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
+    # In allow_failures
+    - os: linux
       env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_build_test_conda"
-        - JOB_TAG=_BUILD_TEST
-        - TEST_ARGS="--skip-slow"
-        - FULL_DEPS=true
-        - BUILD_TEST=true
-        - CACHE_NAME="27_build_test_conda"
-        - USE_CACHE=true
-#    In allow_failures
-    - python: 3.5
+        - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+    # In allow_failures
+    - os: linux
       env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_numpy_dev"
-        - JOB_TAG=_NUMPY_DEV
-        - TEST_ARGS="--skip-slow --skip-network"
-        - PANDAS_TESTING_MODE="deprecate"
-        - CACHE_NAME="35_numpy_dev"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - libatlas-base-dev
-          - gfortran
-#    In allow_failures
-    - python: 3.5
+        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+    # In allow_failures
+    - os: linux
       env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "doc_build"
-        - FULL_DEPS=true
-        - DOC_BUILD=true
-        - JOB_TAG=_DOC_BUILD
-        - CACHE_NAME="doc_build"
-        - USE_CACHE=true
+        - JOB="3.5_DOC" DOC=true
     allow_failures:
-      - python: 2.7
+      - os: linux
         env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_slow"
-        - JOB_TAG=_SLOW
-        - TEST_ARGS="--only-slow --skip-network"
-        - FULL_DEPS=true
-        - CACHE_NAME="27_slow"
-        - USE_CACHE=true
-      - python: 2.7
+          - JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
+      - os: linux
         env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_build_test_conda"
-        - JOB_TAG=_BUILD_TEST
-        - TEST_ARGS="--skip-slow"
-        - FULL_DEPS=true
-        - BUILD_TEST=true
-        - CACHE_NAME="27_build_test_conda"
-        - USE_CACHE=true
-      - python: 3.5
+          - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+      - os: linux
         env:
-          - PYTHON_VERSION=3.5
-          - JOB_NAME: "35_numpy_dev"
-          - JOB_TAG=_NUMPY_DEV
-          - TEST_ARGS="--skip-slow --skip-network"
-          - PANDAS_TESTING_MODE="deprecate"
-          - CACHE_NAME="35_numpy_dev"
-          - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - libatlas-base-dev
-            - gfortran
-      - python: 3.5
+          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+      - os: linux
         env:
-        - PYTHON_VERSION=3.5
-        - JOB_NAME: "doc_build"
-        - FULL_DEPS=true
-        - DOC_BUILD=true
-        - JOB_TAG=_DOC_BUILD
-        - CACHE_NAME="doc_build"
-        - USE_CACHE=true
+          - JOB="3.5_DOC" DOC=true
 
 before_install:
   - echo "before_install"
   - source ci/travis_process_gbq_encryption.sh
-  - echo $VIRTUAL_ENV
   - export PATH="$HOME/miniconda3/bin:$PATH"
   - df -h
-  - date
   - pwd
   - uname -a
-  - python -V
   - git --version
   - git tag
   - ci/before_install_travis.sh
-  - export DISPLAY=:99.0
+  - export DISPLAY=":99.0"
 
 install:
   - echo "install start"
-  - ci/check_cache.sh
   - ci/prep_cython_cache.sh
   - ci/install_travis.sh
   - ci/submit_cython_cache.sh
   - echo "install done"
 
 before_script:
-  - source activate pandas && pip install codecov
   - ci/install_db_travis.sh
 
 script:
@@ -217,12 +119,15 @@ script:
   - echo "script done"
 
 after_success:
-  - source activate pandas && codecov
+  -  ci/upload_coverage.sh
 
 after_script:
   - echo "after_script start"
-  - ci/install_test.sh
   - source activate pandas && python -c "import pandas; pandas.show_versions();"
-  - ci/print_skipped.py /tmp/single.xml
-  - ci/print_skipped.py /tmp/multiple.xml
+  - if [ -e /tmp/single.xml ]; then
+    ci/print_skipped.py /tmp/single.xml;
+    fi
+  - if [ -e /tmp/multiple.xml ]; then
+    ci/print_skipped.py /tmp/multiple.xml;
+    fi
   - echo "after_script done"

Makefile

@@ -1,4 +1,4 @@
-tseries: pandas/lib.pyx pandas/tslib.pyx pandas/hashtable.pyx
+tseries: pandas/_libs/lib.pyx pandas/_libs/tslib.pyx pandas/_libs/hashtable.pyx
 	python setup.py build_ext --inplace
 
 .PHONY : develop build clean clean_pyc tseries doc
@@ -9,9 +9,6 @@ clean:
 clean_pyc:
 	-find . -name '*.py[co]' -exec rm {} \;
 
-sparse: pandas/src/sparse.pyx
-	python setup.py build_ext --inplace
-
 build: clean_pyc
 	python setup.py build_ext --inplace
 

README.md

@@ -41,8 +41,8 @@
 <tr>
   <td></td>
   <td>
-    <a href="https://ci.appveyor.com/project/jreback/pandas-465">
-    <img src="https://ci.appveyor.com/api/projects/status/iblk29s98quexwxi/branch/master?svg=true" alt="appveyor build status" />
+    <a href="https://ci.appveyor.com/project/pandas-dev/pandas">
+    <img src="https://ci.appveyor.com/api/projects/status/86vn83mxgnl4xf1s/branch/master?svg=true" alt="appveyor build status" />
     </a>
   </td>
 </tr>
@@ -54,7 +54,15 @@
   <td>Conda</td>
   <td>
     <a href="http://pandas.pydata.org">
-    <img src="http://pubbadges.s3-website-us-east-1.amazonaws.com/pkgs-downloads-pandas.png" alt="conda downloads" />
+    <img src="http://pubbadges.s3-website-us-east-1.amazonaws.com/pkgs-downloads-pandas.png" alt="conda default downloads" />
+    </a>
+  </td>
+</tr>
+<tr>
+  <td>Conda-forge</td>
+  <td>
+    <a href="http://pandas.pydata.org">
+    <img src="https://anaconda.org/conda-forge/pandas/badges/downloads.svg" alt="conda-forge downloads" />
     </a>
   </td>
 </tr>

RELEASE.md

@@ -1,6 +1,6 @@
 Release Notes
 =============
 
-The list of changes to pandas between each release can be found
+The list of changes to Pandas between each release can be found
 [here](http://pandas.pydata.org/pandas-docs/stable/whatsnew.html). For full
 details, see the commit logs at http://github.com/pandas-dev/pandas.

appveyor.yml

@@ -30,13 +30,6 @@ environment:
       CONDA_PY: "27"
       CONDA_NPY: "110"
 
-    - CONDA_ROOT: "C:\\Miniconda3_64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "35"
-      CONDA_NPY: "111"
-
-
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
 platform:
@@ -79,11 +72,11 @@ install:
   - cmd: conda info -a
 
   # create our env
-  - cmd: conda create -q -n pandas python=%PYTHON_VERSION% cython pytest
+  - cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest pytest-xdist
   - cmd: activate pandas
-  - SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
+  - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run
   - cmd: echo "installing requirements from %REQ%"
-  - cmd: conda install -n pandas -q --file=%REQ%
+  - cmd: conda install -n pandas --file=%REQ%
   - cmd: conda list -n pandas
   - cmd: echo "installing requirements from %REQ% - done"
 

asv_bench/benchmarks/binary_ops.py

@@ -107,4 +107,4 @@ def setup(self):
         self.s = Series(date_range('20010101', periods=self.N, freq='T', tz='US/Eastern'))
         self.ts = self.s[self.halfway]
 
-        self.s2 = Series(date_range('20010101', periods=self.N, freq='s',  tz='US/Eastern'))
+        self.s2 = Series(date_range('20010101', periods=self.N, freq='s',  tz='US/Eastern'))

asv_bench/benchmarks/categoricals.py

@@ -63,3 +63,37 @@ def time_value_counts_dropna(self):
 
     def time_rendering(self):
         str(self.sel)
+
+
+class Categoricals3(object):
+    goal_time = 0.2
+
+    def setup(self):
+        N = 100000
+        ncats = 100
+
+        self.s1 = Series(np.array(tm.makeCategoricalIndex(N, ncats)))
+        self.s1_cat = self.s1.astype('category')
+        self.s1_cat_ordered = self.s1.astype('category', ordered=True)
+
+        self.s2 = Series(np.random.randint(0, ncats, size=N))
+        self.s2_cat = self.s2.astype('category')
+        self.s2_cat_ordered = self.s2.astype('category', ordered=True)
+
+    def time_rank_string(self):
+        self.s1.rank()
+
+    def time_rank_string_cat(self):
+        self.s1_cat.rank()
+
+    def time_rank_string_cat_ordered(self):
+        self.s1_cat_ordered.rank()
+
+    def time_rank_int(self):
+        self.s2.rank()
+
+    def time_rank_int_cat(self):
+        self.s2_cat.rank()
+
+    def time_rank_int_cat_ordered(self):
+        self.s2_cat_ordered.rank()