Merge branch 'master' into bugfixs/19671

Author: minggli

.travis.yml

@@ -50,9 +50,6 @@ matrix:
           packages:
           - python-gtk2
     # In allow_failures
-    - dist: trusty
-      env:
-        - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
     - dist: trusty
       env:
         - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true COVERAGE=true
@@ -63,43 +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_ASV" ASV=true
-    # In allow_failures
     - dist: trusty
       env:
         - JOB="3.6_DOC" DOC=true
     allow_failures:
-      - dist: trusty
-        env:
-          - JOB="3.5_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
       - 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_ASV" ASV=true
       - dist: trusty
         env:
           - JOB="3.6_DOC" DOC=true
@@ -135,7 +115,6 @@ script:
   - ci/script_single.sh
   - ci/script_multi.sh
   - ci/lint.sh
-  - ci/asv.sh
   - echo "checking imports"
   - source activate pandas && python ci/check_imports.py
   - echo "script done"

asv_bench/benchmarks/rolling.py

@@ -16,12 +16,26 @@ class Methods(object):
 
     def setup(self, constructor, window, dtype, method):
         N = 10**5
-        arr = np.random.random(N).astype(dtype)
+        arr = (100 * np.random.random(N)).astype(dtype)
         self.roll = getattr(pd, constructor)(arr).rolling(window)
 
     def time_rolling(self, constructor, window, dtype, method):
         getattr(self.roll, method)()
 
+class VariableWindowMethods(Methods):
+    sample_time = 0.2
+    params = (['DataFrame', 'Series'],
+              ['50s', '1h', '1d'],
+              ['int', 'float'],
+              ['median', 'mean', 'max', 'min', 'std', 'count', 'skew', 'kurt',
+               'sum'])
+    param_names = ['contructor', 'window', 'dtype', 'method']
+
+    def setup(self, constructor, window, dtype, method):
+        N = 10**5
+        arr = (100 * np.random.random(N)).astype(dtype)
+        index = pd.date_range('2017-01-01', periods=N, freq='5s')
+        self.roll = getattr(pd, constructor)(arr, index=index).rolling(window)
 
 class Pairwise(object):
 

ci/asv.sh

@@ -50,12 +50,6 @@ conda config --set ssl_verify false || exit 1
 conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
 conda update -q conda
 
-if [ "$CONDA_BUILD_TEST" ]; then
-    echo
-    echo "[installing conda-build]"
-    conda install conda-build
-fi
-
 echo
 echo "[add channels]"
 conda config --remove channels defaults || exit 1
@@ -121,15 +115,6 @@ if [ "$COVERAGE" ]; then
     pip install coverage pytest-cov
 fi
 
-echo
-if [ -z "$PIP_BUILD_TEST" ] && [ -z "$CONDA_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]"
@@ -167,32 +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
-
-elif [ "$CONDA_BUILD_TEST" ]; then
-
-    # build & install testing
-    echo "[building conda recipe]"
-    time conda build ./conda.recipe --python 3.5 -q --no-test || exit 1
-
-    echo "[installing]"
-    conda install pandas --use-local || 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/install_travis.sh

@@ -2,7 +2,7 @@
 
 source activate pandas
 
-echo "install 35 CONDA_BUILD_TEST"
+echo "install 35"
 
 # pip install python-dateutil to get latest
 conda remove -n pandas python-dateutil --force

ci/requirements-3.5_CONDA_BUILD_TEST.build renamed to ci/requirements-3.5.build

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

ci/requirements-3.5_CONDA_BUILD_TEST.pip renamed to ci/requirements-3.5.pip

@@ -12,34 +12,20 @@ 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" ] || [ "$CONDA_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 [ "$ASV" ]; then
-    echo "We are not running pytest as this is an asv-build"
-
 elif [ "$COVERAGE" ]; then
     echo pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas
     pytest -s -n 2 -m "not single" --cov=pandas --cov-report xml:/tmp/cov-multiple.xml --junitxml=/tmp/multiple.xml --strict $TEST_ARGS pandas

ci/requirements-3.5_CONDA_BUILD_TEST.run renamed to ci/requirements-3.5.run

@@ -16,15 +16,14 @@ if [ "$SLOW" ]; then
     TEST_ARGS="--only-slow --skip-network"
 fi
 
-if [ "$PIP_BUILD_TEST" ] || [ "$CONDA_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 [ "$ASV" ]; then
-    echo "We are not running pytest as this is an asv-build"
-
 elif [ "$COVERAGE" ]; then
     echo pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas
     pytest -s -m "single" --strict --cov=pandas --cov-report xml:/tmp/cov-single.xml --junitxml=/tmp/single.xml $TEST_ARGS pandas