Merge remote-tracking branch 'origin/master' into pickle_io_compression

# Conflicts:
#	pandas/io/tests/test_pickle.py

Author: goldenbull

.github/CONTRIBUTING.md

@@ -19,6 +19,7 @@
 .noseids
 .ipynb_checkpoints
 .tags
+.cache/
 
 # Compiled source #
 ###################
@@ -56,6 +57,8 @@ dist
 **/wheelhouse/*
 # coverage
 .coverage
+coverage.xml
+coverage_html_report
 
 # OS generated files #
 ######################

.gitignore

@@ -32,7 +32,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_osx"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - BUILD_TYPE=conda
         - JOB_TAG=_OSX
         - TRAVIS_PYTHON_VERSION=3.5
@@ -42,7 +42,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow_nnet_LOCALE"
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - LOCALE_OVERRIDE="zh_CN.UTF-8"
         - FULL_DEPS=true
         - JOB_TAG=_LOCALE
@@ -56,7 +56,7 @@ matrix:
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_nslow"
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - CLIPBOARD_GUI=gtk2
         - LINT=true
@@ -70,7 +70,7 @@ matrix:
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_nslow"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - COVERAGE=true
@@ -84,35 +84,20 @@ matrix:
       env:
         - PYTHON_VERSION=3.6
         - JOB_NAME: "36"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
       addons:
         apt:
           packages:
           - libatlas-base-dev
           - gfortran
-#    In allow_failures
-    - python: 2.7
-      env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="not slow and not network and not disabled"
-        - LOCALE_OVERRIDE="it_IT.UTF-8"
-        - INSTALL_TEST=true
-        - JOB_TAG=_COMPAT
-        - CACHE_NAME="27_nslow_nnet_COMPAT"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - language-pack-it
 #    In allow_failures
     - python: 2.7
       env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
@@ -122,47 +107,18 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
-#    In allow_failures
-    - python: 3.4
-      env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_nslow"
-        - NOSE_ARGS="not slow and not disabled"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_nslow"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - xsel
-#    In allow_failures
-    - python: 3.4
-      env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_slow"
-        - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_slow"
-        - USE_CACHE=true
-      addons:
-        apt:
-          packages:
-          - xsel
 #    In allow_failures
     - python: 3.5
       env:
         - PYTHON_VERSION=3.5
         - JOB_NAME: "35_numpy_dev"
         - JOB_TAG=_NUMPY_DEV
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - TEST_ARGS="--skip-slow --skip-network"
         - PANDAS_TESTING_MODE="deprecate"
         - CACHE_NAME="35_numpy_dev"
         - USE_CACHE=true
@@ -175,16 +131,6 @@ matrix:
     - python: 3.5
       env:
         - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_ascii"
-        - JOB_TAG=_ASCII
-        - NOSE_ARGS="not slow and not network and not disabled"
-        - LOCALE_OVERRIDE="C"
-        - CACHE_NAME="35_ascii"
-        - USE_CACHE=true
-#    In allow_failures
-    - python: 2.7
-      env:
-        - PYTHON_VERSION=2.7
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true
@@ -197,53 +143,26 @@ matrix:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_slow"
         - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
+        - TEST_ARGS="--only-slow --skip-network"
         - FULL_DEPS=true
         - CACHE_NAME="27_slow"
         - USE_CACHE=true
-      - python: 3.4
-        env:
-        - PYTHON_VERSION=3.4
-        - JOB_NAME: "34_slow"
-        - JOB_TAG=_SLOW
-        - NOSE_ARGS="slow and not network and not disabled"
-        - FULL_DEPS=true
-        - CLIPBOARD=xsel
-        - CACHE_NAME="34_slow"
-        - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - xsel
       - python: 2.7
         env:
         - PYTHON_VERSION=2.7
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="not slow and not disabled"
+        - TEST_ARGS="--skip-slow"
         - FULL_DEPS=true
         - BUILD_TEST=true
         - CACHE_NAME="27_build_test_conda"
         - USE_CACHE=true
-      - python: 3.4
-        env:
-          - PYTHON_VERSION=3.4
-          - JOB_NAME: "34_nslow"
-          - NOSE_ARGS="not slow and not disabled"
-          - FULL_DEPS=true
-          - CLIPBOARD=xsel
-          - CACHE_NAME="34_nslow"
-          - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - xsel
       - python: 3.5
         env:
           - PYTHON_VERSION=3.5
           - JOB_NAME: "35_numpy_dev"
           - JOB_TAG=_NUMPY_DEV
-          - NOSE_ARGS="not slow and not network and not disabled"
+          - TEST_ARGS="--skip-slow --skip-network"
           - PANDAS_TESTING_MODE="deprecate"
           - CACHE_NAME="35_numpy_dev"
           - USE_CACHE=true
@@ -252,32 +171,9 @@ matrix:
             packages:
             - libatlas-base-dev
             - gfortran
-      - python: 2.7
-        env:
-        - PYTHON_VERSION=2.7
-        - JOB_NAME: "27_nslow_nnet_COMPAT"
-        - NOSE_ARGS="not slow and not network and not disabled"
-        - LOCALE_OVERRIDE="it_IT.UTF-8"
-        - INSTALL_TEST=true
-        - JOB_TAG=_COMPAT
-        - CACHE_NAME="27_nslow_nnet_COMPAT"
-        - USE_CACHE=true
-        addons:
-          apt:
-            packages:
-            - language-pack-it
       - python: 3.5
         env:
         - PYTHON_VERSION=3.5
-        - JOB_NAME: "35_ascii"
-        - JOB_TAG=_ASCII
-        - NOSE_ARGS="not slow and not network and not disabled"
-        - LOCALE_OVERRIDE="C"
-        - CACHE_NAME="35_ascii"
-        - USE_CACHE=true
-      - python: 2.7
-        env:
-        - PYTHON_VERSION=2.7
         - JOB_NAME: "doc_build"
         - FULL_DEPS=true
         - DOC_BUILD=true
@@ -295,7 +191,6 @@ before_install:
   - pwd
   - uname -a
   - python -V
-# git info & get tags
   - git --version
   - git tag
   - ci/before_install_travis.sh
@@ -311,12 +206,13 @@ install:
 
 before_script:
   - source activate pandas && pip install codecov
-  - ci/install_db.sh
+  - ci/install_db_travis.sh
 
 script:
   - echo "script start"
   - ci/run_build_docs.sh
-  - ci/script.sh
+  - ci/script_single.sh
+  - ci/script_multi.sh
   - ci/lint.sh
   - echo "script done"
 
@@ -327,5 +223,6 @@ 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/nosetests.xml
+  - ci/print_skipped.py /tmp/single.xml
+  - ci/print_skipped.py /tmp/multiple.xml
   - echo "after_script done"

.travis.yml

@@ -7,7 +7,6 @@ include setup.py
 graft doc
 prune doc/build
 
-graft examples
 graft pandas
 
 global-exclude *.so

MANIFEST.in

@@ -12,7 +12,7 @@
   <td><img src="https://img.shields.io/pypi/v/pandas.svg" alt="latest release" /></td>
 </tr>
   <td></td>
-  <td><img src="https://anaconda.org/pandas/pandas/badges/version.svg" alt="latest release" /></td>
+  <td><img src="https://anaconda.org/conda-forge/pandas/badges/version.svg" alt="latest release" /></td>
 </tr>
 <tr>
   <td>Package Status</td>
@@ -30,6 +30,15 @@
     </a>
   </td>
 </tr>
+<tr>
+  <td></td>
+  <td>
+    <a href="https://circleci.com/gh/pandas-dev/pandas">
+    <img src="https://circleci.com/gh/circleci/mongofinil/tree/master.svg?style=shield&circle-token=223d8cafa7b02902c3e150242520af8944e34671" alt="circleci build status" />
+    </a>
+  </td>
+</tr>
+<tr>
   <td></td>
   <td>
     <a href="https://ci.appveyor.com/project/jreback/pandas-465">