Merge commit 'v0.17.0rc1-92-gc6bcc99' into debian

* commit 'v0.17.0rc1-92-gc6bcc99': (29 commits)
  CI: tests latest versions of openpyxl
  COMPAT: openpyxl >= 2.2 support, pandas-dev#10125
  Tests demonstrating how to use sqlalchemy.text() objects in read_sql()
  TST: Capture warnings in _check_plot_works
  COMPAT/BUG: color handling in scatter
  COMPAT: Support for matplotlib 1.5
  ERR/API: Raise NotImplementedError when Panel operator function is not implemented, pandas-dev#7692
  DOC: minor doc formatting fixes
  PERF: nested dict DataFrame construction
  DEPR: deprecate SparsePanel
  BLD: dateutil->python-dateutil in conda recipe
  BUG/API: GH11086 where freq is not inferred if both freq is None
  ENH: add merge indicator to DataFrame.merge
  PERF: improves performance in groupby.size
  BUG: DatetimeTZBlock.fillna raises TypeError
  PERF: infer_datetime_format without padding pandas-dev#11142
  PERF: improves performance in SeriesGroupBy.transform
  TST: Verify fix for buffer overflow in read_csv with engine='c' (GH pandas-dev#9735)
  DEPR: Series.is_timeseries
  BUG: nested construction with timedelta pandas-dev#11129
  ...

.travis.yml

@@ -43,13 +43,6 @@ matrix:
       - CLIPBOARD_GUI=gtk2
       - BUILD_TYPE=conda
       - DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
-    - python: 3.3
-      env:
-      - JOB_NAME: "33_nslow"
-      - NOSE_ARGS="not slow and not disabled"
-      - FULL_DEPS=true
-      - CLIPBOARD=xsel
-      - BUILD_TYPE=conda
     - python: 3.4
       env:
       - JOB_NAME: "34_nslow"
@@ -64,6 +57,13 @@ matrix:
       - FULL_DEPS=true
       - CLIPBOARD=xsel
       - BUILD_TYPE=conda
+    - python: 3.3
+      env:
+      - JOB_NAME: "33_nslow"
+      - NOSE_ARGS="not slow and not disabled"
+      - FULL_DEPS=true
+      - CLIPBOARD=xsel
+      - BUILD_TYPE=conda
     - python: 2.7
       env:
       - JOB_NAME: "27_slow"
@@ -104,10 +104,10 @@ matrix:
       - BUILD_TYPE=pydata
       - PANDAS_TESTING_MODE="deprecate"
     allow_failures:
-      - python: 3.5
+      - python: 3.3
         env:
-        - JOB_NAME: "35_nslow"
-        - NOSE_ARGS="not slow and not network and not disabled"
+        - JOB_NAME: "33_nslow"
+        - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
         - BUILD_TYPE=conda

ci/install_conda.sh

@@ -72,27 +72,20 @@ bash miniconda.sh -b -p $HOME/miniconda || exit 1
 
 conda config --set always_yes yes --set changeps1 no || exit 1
 conda update -q conda || exit 1
+conda config --add channels conda-forge || exit 1
 conda config --add channels http://conda.binstar.org/pandas || exit 1
 conda config --set ssl_verify false || exit 1
 
 # Useful for debugging any issues with conda
 conda info -a || exit 1
 
-REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt"
-conda create -n pandas python=$TRAVIS_PYTHON_VERSION || exit 1
-conda install -n pandas --file=${REQ} || exit 1
-
-conda install -n pandas pip setuptools nose || exit 1
-conda remove -n pandas pandas
+# build deps
+REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build"
+time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose || exit 1
+time conda install -n pandas --file=${REQ} || exit 1
 
 source activate pandas
 
-# we may have additional pip installs
-REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
-if [ -e ${REQ} ]; then
-    pip install -r $REQ
-fi
-
 # set the compiler cache to work
 if [ "$IRON_TOKEN" ]; then
     export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
@@ -104,15 +97,33 @@ if [ "$IRON_TOKEN" ]; then
 fi
 
 if [ "$BUILD_TEST" ]; then
+
+    # build testing
     pip uninstall --yes cython
     pip install cython==0.15.1
     ( python setup.py build_ext --inplace && python setup.py develop ) || true
+
 else
-    python setup.py build_ext --inplace && python setup.py develop
-fi
 
-for package in beautifulsoup4; do
-    pip uninstall --yes $package
-done
+    # build but don't install
+    time python setup.py build_ext --inplace || exit 1
+
+    # we may have run installations
+    REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.run"
+    time conda install -n pandas --file=${REQ} || exit 1
+
+    # we may have additional pip installs
+    REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
+    if [ -e ${REQ} ]; then
+        pip install -r $REQ
+    fi
+
+    # remove any installed pandas package
+    conda remove pandas
+
+    # install our pandas
+    python setup.py develop  || exit 1
+
+fi
 
 true

ci/install_pydata.sh

@@ -90,7 +90,8 @@ fi
 # Force virtualenv to accept system_site_packages
 rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
 
-time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
+# build deps
+time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.build
 
 # Need to enable for locale testing. The location of the locale file(s) is
 # distro specific. For example, on Arch Linux all of the locales are in a
@@ -147,6 +148,9 @@ else
     python setup.py develop
 fi
 
+# install the run libs
+time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.run
+
 # restore cython (if not numpy building)
 if [ -z "$NUMPY_BUILD" ]; then
     time pip install $PIP_ARGS  $(cat ci/requirements-${wheel_box}.txt | grep -i cython)

ci/requirements-2.6.build

@@ -0,0 +1,4 @@
+numpy=1.7.0
+cython=0.19.1
+dateutil=1.5
+pytz=2013b

ci/requirements-2.6.pip

@@ -1 +1,3 @@
 blosc
+openpyxl
+argparse

ci/requirements-2.6.txt → ci/requirements-2.6.run

@@ -1,11 +1,9 @@
 numpy=1.7.0
-cython=0.19.1
 dateutil=1.5
 pytz=2013b
 scipy=0.11.0
 xlwt=0.7.5
 xlrd=0.9.2
-openpyxl=2.0.3
 statsmodels=0.4.3
 html5lib=1.0b2
 beautiful-soup=4.2.0

ci/requirements-2.7.build

@@ -0,0 +1,4 @@
+dateutil=2.1
+pytz=2013b
+numpy=1.7.1
+cython=0.19.1

ci/requirements-2.7.txt → ci/requirements-2.7.run

@@ -1,8 +1,7 @@
 dateutil=2.1
 pytz=2013b
+numpy=1.7.1
 xlwt=0.7.5
-numpy=1.7.0
-cython=0.19.1
 numexpr=2.2.2
 pytables=3.0.0
 matplotlib=1.3.1
@@ -12,11 +11,11 @@ sqlalchemy=0.9.6
 lxml=3.2.1
 scipy
 xlsxwriter=0.4.6
-statsmodels
 boto=2.36.0
 bottleneck=0.8.0
 psycopg2=2.5.2
 patsy
 pymysql=0.6.3
 html5lib=1.0b2
 beautiful-soup=4.2.1
+statsmodels

ci/requirements-2.7_BUILD_TEST.txt → ci/requirements-2.7_BUILD_TEST.build

@@ -2,4 +2,3 @@ dateutil
 pytz
 numpy
 cython
-nose

ci/requirements-2.7_LOCALE.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz=2013b
+numpy=1.7.1
+cython=0.19.1

ci/requirements-2.7_LOCALE.txt → ci/requirements-2.7_LOCALE.run

@@ -1,11 +1,10 @@
 python-dateutil
 pytz=2013b
+numpy=1.7.1
 xlwt=0.7.5
 openpyxl=1.6.2
 xlsxwriter=0.4.6
 xlrd=0.9.2
-numpy=1.7.1
-cython=0.19.1
 bottleneck=0.8.0
 matplotlib=1.2.1
 patsy=0.1.0

ci/requirements-2.7_SLOW.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz
+numpy
+cython

ci/requirements-2.7_SLOW.txt → ci/requirements-2.7_SLOW.run

@@ -1,7 +1,6 @@
 python-dateutil
 pytz
 numpy
-cython
 matplotlib
 scipy
 patsy

ci/requirements-3.3.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz=2013b
+numpy=1.8.0
+cython=0.19.1

ci/requirements-3.3.pip

@@ -1 +1,2 @@
 blosc
+openpyxl

ci/requirements-3.3.txt → ci/requirements-3.3.run

@@ -1,11 +1,10 @@
 python-dateutil
 pytz=2013b
-openpyxl=1.6.2
+numpy=1.8.0
 xlsxwriter=0.4.6
 xlrd=0.9.2
+xlwt
 html5lib=1.0b2
-numpy=1.8.0
-cython=0.19.1
 numexpr
 pytables
 bottleneck=0.8.0

ci/requirements-3.4.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz
+numpy
+cython

ci/requirements-3.4_SLOW.txt → ci/requirements-3.4.run

@@ -1,20 +1,18 @@
 python-dateutil
 pytz
+numpy
 openpyxl
 xlsxwriter
 xlrd
 xlwt
 html5lib
 patsy
 beautiful-soup
-numpy
-cython
 scipy
 numexpr
 pytables
-matplotlib=1.3.1
 lxml
 sqlalchemy
 bottleneck
-pymysql
+pymysql=0.6.3
 psycopg2

ci/requirements-3.4_SLOW.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz
+numpy
+cython

ci/requirements-3.4.txt → ci/requirements-3.4_SLOW.run

@@ -1,20 +1,20 @@
 python-dateutil
 pytz
+numpy
 openpyxl
 xlsxwriter
 xlrd
 xlwt
 html5lib
 patsy
 beautiful-soup
-numpy
-cython
 scipy
 numexpr
 pytables
 matplotlib
 lxml
 sqlalchemy
 bottleneck
-pymysql==0.6.3
+pymysql
 psycopg2
+statsmodels

ci/requirements-3.5.build

@@ -0,0 +1,4 @@
+python-dateutil
+pytz
+numpy
+cython

ci/requirements-3.5.run

@@ -0,0 +1,23 @@
+python-dateutil
+pytz
+numpy
+openpyxl
+xlsxwriter
+xlrd
+xlwt
+patsy
+scipy
+numexpr
+pytables
+html5lib
+lxml
+
+# currently causing some warnings
+#sqlalchemy
+#pymysql
+#psycopg2
+
+# not available from conda
+#beautiful-soup
+#bottleneck
+#matplotlib