Merge branch 'master' into dep_keyword

Author: EricChea

.travis.yml

@@ -50,9 +50,6 @@ matrix:
           packages:
           - python-gtk2
     # In allow_failures
-    - dist: trusty
-      env:
-        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
     - dist: trusty
       env:
         - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
@@ -63,36 +60,26 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
+        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
       addons:
         apt:
           packages:
           - xsel
     # In allow_failures
-    - dist: trusty
-      env:
-        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
-    # In allow_failures
     - dist: trusty
       env:
         - JOB="3.6_DOC" DOC=true
     allow_failures:
-      - dist: trusty
-        env:
-          - JOB="3.5" TEST_ARGS="--skip-slow --skip-network"
       - dist: trusty
         env:
           - JOB="2.7_SLOW" SLOW=true
       - dist: trusty
         env:
-          - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
+          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
         addons:
           apt:
             packages:
             - xsel
-      - dist: trusty
-        env:
-          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
       - dist: trusty
         env:
           - JOB="3.6_DOC" DOC=true

ci/install_travis.sh

@@ -115,15 +115,6 @@ if [ "$COVERAGE" ]; then
     pip install coverage pytest-cov
 fi
 
-echo
-if [ -z "$PIP_BUILD_TEST" ] ; then
-
-    # build but don't install
-    echo "[build em]"
-    time python setup.py build_ext --inplace || exit 1
-
-fi
-
 # we may have run installations
 echo
 echo "[conda installs]"
@@ -161,23 +152,8 @@ conda list pandas
 pip list --format columns |grep pandas
 
 # build and install
-echo
-
-if [ "$PIP_BUILD_TEST" ]; then
-
-    # build & install testing
-    echo "[building release]"
-    time bash scripts/build_dist_for_release.sh || exit 1
-    conda uninstall -y cython
-    time pip install dist/*tar.gz || exit 1
-
-else
-
-    # install our pandas
-    echo "[running setup.py develop]"
-    python setup.py develop  || exit 1
-
-fi
+echo "[running setup.py develop]"
+python setup.py develop  || exit 1
 
 echo
 echo "[show pandas]"

ci/requirements-3.6_PIP_BUILD_TEST.build

@@ -7,4 +7,4 @@ pytest>=3.1
 python-dateutil>=2.5.0
 pytz
 setuptools>=3.3
-sphinx
+sphinx=1.5*

ci/requirements-3.6_PIP_BUILD_TEST.pip

@@ -12,29 +12,18 @@ if [ -n "$LOCALE_OVERRIDE" ]; then
     python -c "$pycmd"
 fi
 
+# Enforce absent network during testing by faking a proxy
+if echo "$TEST_ARGS" | grep -e --skip-network -q; then
+    export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
+fi
+
 # Workaround for pytest-xdist flaky collection order
 # https://github.com/pytest-dev/pytest/issues/920
 # https://github.com/pytest-dev/pytest/issues/1075
 export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
 echo PYTHONHASHSEED=$PYTHONHASHSEED
 
-if [ "$PIP_BUILD_TEST" ] ; then
-    echo "[build-test]"
-
-    echo "[env]"
-    pip list --format columns |grep pandas
-
-    echo "[running]"
-    cd /tmp
-    unset PYTHONPATH
-
-    echo "[build-test: single]"
-    python -c 'import pandas; pandas.test(["--skip-slow", "--skip-network", "-r xX", "-m single"])'
-
-    echo "[build-test: not single]"
-    python -c 'import pandas; pandas.test(["-n 2", "--skip-slow", "--skip-network", "-r xX", "-m not single"])'
-
-elif [ "$DOC" ]; then
+if [ "$DOC" ]; then
     echo "We are not running pytest as this is a doc-build"
 
 elif [ "$COVERAGE" ]; then

ci/requirements-3.6_PIP_BUILD_TEST.sh

@@ -16,10 +16,12 @@ if [ "$SLOW" ]; then
     TEST_ARGS="--only-slow --skip-network"
 fi
 
-if [ "$PIP_BUILD_TEST" ]; then
-    echo "We are not running pytest as this is a build test."
+# Enforce absent network during testing by faking a proxy
+if echo "$TEST_ARGS" | grep -e --skip-network -q; then
+    export http_proxy=http://1.2.3.4 https_proxy=http://1.2.3.4;
+fi
 
-elif [ "$DOC" ]; then
+if [ "$DOC" ]; then
     echo "We are not running pytest as this is a doc-build"
 
 elif [ "$COVERAGE" ]; then

ci/requirements_dev.txt

@@ -274,7 +274,7 @@ Passing a list of labels or tuples works similar to reindexing:
 
    df.loc[[('bar', 'two'), ('qux', 'one')]]
 
-.. info::
+.. note::
 
    It is important to note that tuples and lists are not treated identically
    in pandas when it comes to indexing. Whereas a tuple is interpreted as one

ci/script_multi.sh

@@ -1682,6 +1682,16 @@ MultiIndex Components
    MultiIndex.reorder_levels
    MultiIndex.remove_unused_levels
 
+MultiIndex Selecting
+~~~~~~~~~~~~~~~~~~~~
+
+.. autosummary::
+   :toctree: generated/
+
+   MultiIndex.get_loc
+   MultiIndex.get_indexer
+   MultiIndex.get_level_values
+
 .. _api.datetimeindex:
 
 DatetimeIndex