updating this scipy to match the master

.travis.yml

@@ -209,7 +209,7 @@ before_install:
     fi
   - |
     if [ "${TESTMODE}" == "full" ]; then
-        travis_retry pip install pytest-cov coverage matplotlib==3.2.0rc1 scikit-umfpack scikit-sparse
+        travis_retry pip install pytest-cov coverage matplotlib scikit-umfpack scikit-sparse
     fi
   - |
     if [ "${REFGUIDE_CHECK}" == "1" ]; then

THANKS.txt

@@ -228,6 +228,9 @@ Domen Gorjup and Janko Slavič for continuous wavelet transform with complex
     wavelets fix.
 Søren Fuglede Jørgensen for improvements to scipy.sparse.csgraph
 Grzegorz Mrukwa for a bug fix in rectangular_lsap.cpp
+Santiago Hernandez for a bug fix in scipy.optimize._differentialevolution.py.
+Dan Kleeman for implementing nan_policy in stats.zscores and winsorize
+James Wright for simple documentation fixes
 
 Institutions
 ------------

azure-pipelines.yml

@@ -13,8 +13,10 @@ trigger:
       - './*.txt'
       - 'site.cfg.example'
 
-# the version of OpenBLAS used is currently 0.3.7
+# the version of OpenBLAS used is currently 0.3.8.dev
 # and should be updated to match scipy-wheels as appropriate
+variables:
+    openblas_version: 0.3.8.dev
 
 jobs:
 - job: Linux_Python_36_32bit_full
@@ -30,15 +32,16 @@ jobs:
            curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
            python3.6 get-pip.py && \
            pip3 --version && \
-           pip3 install setuptools wheel numpy cython==0.29.14 pybind11 pytest pytest-timeout pytest-xdist pytest-env pytest-cov Pillow mpmath matplotlib --user && \
+           pip3 install setuptools wheel numpy cython==0.29.14 pybind11 pytest pytest-timeout pytest-xdist pytest-env pytest-cov Pillow mpmath matplotlib==3.1.3 --user && \
            apt-get -y install gfortran-5 wget && \
            cd .. && \
            mkdir openblas && cd openblas && \
-           wget https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com/openblas-v0.3.7-manylinux1_i686.tar.gz && \
-           tar zxvf openblas-v0.3.7-manylinux1_i686.tar.gz && \
-           cp -r ./usr/local/lib/* /usr/lib && \
-           cp ./usr/local/include/* /usr/include && \
+           target=\$(python3.6 ../scipy/tools/openblas_support.py) && \
+           cp -r \$target/lib/* /usr/lib && \
+           cp \$target/include/* /usr/include && \
            cd ../scipy && \
+           F77=gfortran-5 F90=gfortran-5 python3.6 setup.py install && \
+           python3.6 tools/openblas_support.py --check_version $(openblas_version) && \
            F77=gfortran-5 F90=gfortran-5 python3.6 runtests.py --mode=full -- -n auto -s --junitxml=junit/test-results.xml --cov-config=.coveragerc --cov-report=xml --cov-report=html"
     displayName: 'Run 32-bit Ubuntu Docker Build / Tests'
   - task: PublishTestResults@2
@@ -56,9 +59,6 @@ jobs:
   condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/master'))  # skip for PR merges
   pool:
     vmImage: 'VS2017-Win2016'
-  variables:
-      OPENBLAS_32: https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com/openblas-v0.3.7-win32-gcc_7_1_0.zip
-      OPENBLAS_64: https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com/openblas-v0.3.7-win_amd64-gcc_7_1_0.zip
   strategy:
     maxParallel: 4
     matrix:
@@ -95,15 +95,12 @@ jobs:
   - script: python -m pip install --upgrade pip setuptools wheel
     displayName: 'Install tools'
   - powershell: |
-      $wc = New-Object net.webclient;
-      $wc.Downloadfile("$(OPENBLAS)", "openblas.zip")
-      $tmpdir = New-TemporaryFile | %{ rm $_; mkdir $_ }
-      Expand-Archive "openblas.zip" $tmpdir
-      $pyversion = python -c "from __future__ import print_function; import sys; print(sys.version.split()[0])"
+      $pyversion = python -c "import sys; print(sys.version.split()[0])"
       Write-Host "Python Version: $pyversion"
       $target = "C:\\hostedtoolcache\\windows\\Python\\$pyversion\\$(PYTHON_ARCH)\\lib\\openblas.a"
       Write-Host "target path: $target"
-      cp $tmpdir\$(BITS)\lib\libopenblas_v0.3.7-gcc_7_1_0.a $target
+      $openblas = python tools/openblas_support.py
+      cp $openblas $target
     displayName: 'Download / Install OpenBLAS'
   - powershell: |
       # wheels appear to use mingw64 version 6.3.0, but 6.4.0
@@ -118,12 +115,7 @@ jobs:
   - script: python -m pip install numpy cython==0.29.14 pybind11 pytest pytest-timeout pytest-xdist pytest-env pytest-cov Pillow mpmath
     displayName: 'Install dependencies'
   - powershell: |
-      If ($(PYTHON_VERSION) -ne '3.6') {
-          python -m pip install matplotlib==3.2.0rc1
-      }
-      else {
-          python -m pip install matplotlib
-      }
+      python -m pip install matplotlib
     displayName: 'Install matplotlib'
   # DLL resolution mechanics were changed in
   # Python 3.8: https://bugs.python.org/issue36085

benchmarks/benchmarks/blas_lapack.py

@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import numpy as np
 
 try:

benchmarks/benchmarks/common.py

@@ -1,8 +1,6 @@
 """
 Airspeed Velocity benchmark utilities
 """
-from __future__ import division, absolute_import, print_function
-
 import sys
 import os
 import re

benchmarks/benchmarks/cython_special.py

@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import re
 import numpy as np
 from scipy import special

benchmarks/benchmarks/fft_basic.py

@@ -1,7 +1,5 @@
 """ Test functions for fftpack.basic module
 """
-from __future__ import division, absolute_import, print_function
-
 from numpy import arange, asarray, zeros, dot, exp, pi, double, cdouble
 from numpy.random import rand
 import numpy as np

benchmarks/benchmarks/fftpack_pseudo_diffs.py

@@ -1,7 +1,5 @@
 """ Benchmark functions for fftpack.pseudo_diffs module
 """
-from __future__ import division, absolute_import, print_function
-
 from numpy import arange, sin, cos, pi, exp, tanh, sign
 
 try:

benchmarks/benchmarks/go_benchmark_functions/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
 """
 ==============================================================================
 `go_benchmark_functions` --  Problems for testing global optimization routines

benchmarks/benchmarks/go_benchmark_functions/go_benchmark.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import abs, asarray
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_A.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, cos, exp, pi, prod, sin, sqrt, sum
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_B.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, cos, exp, log, arange, pi, sin, sqrt, sum
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_C.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import (abs, asarray, cos, exp, floor, pi, sign, sin, sqrt, sum,
                    size, tril, isnan, atleast_2d, repeat)

benchmarks/benchmarks/go_benchmark_functions/go_funcs_D.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import abs, cos, exp, arange, pi, sin, sqrt, sum, zeros, tanh
 from numpy.testing import assert_almost_equal

benchmarks/benchmarks/go_benchmark_functions/go_funcs_E.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, asarray, cos, exp, arange, pi, sin, sqrt, sum
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_F.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from .go_benchmark import Benchmark
 
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_G.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import abs, sin, cos, exp, floor, log, arange, prod, sqrt, sum
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_H.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import abs, arctan2, asarray, cos, exp, arange, pi, sin, sqrt, sum
 from .go_benchmark import Benchmark

benchmarks/benchmarks/go_benchmark_functions/go_funcs_I.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import sin, sum
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_J.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import sum, asarray, arange, exp
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_K.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import asarray, atleast_2d, arange, sin, sqrt, prod, sum, round
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_L.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import sum, cos, exp, pi, arange, sin
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_M.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import (abs, asarray, cos, exp, log, arange, pi, prod, sin, sqrt,
                    sum, tan)
 try:

benchmarks/benchmarks/go_benchmark_functions/go_funcs_N.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import cos, sqrt, sin, abs
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_O.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import sum, cos, exp, pi, asarray
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_P.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import (abs, sum, sin, cos, sqrt, log, prod, where, pi, exp, arange,
                    floor, log10, atleast_2d, zeros)
 from .go_benchmark import Benchmark

benchmarks/benchmarks/go_benchmark_functions/go_funcs_Q.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, sum, arange, sqrt
 
 from .go_benchmark import Benchmark

benchmarks/benchmarks/go_benchmark_functions/go_funcs_R.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, sum, sin, cos, asarray, arange, pi, exp, log, sqrt
 from scipy.optimize import rosen
 from .go_benchmark import Benchmark

benchmarks/benchmarks/go_benchmark_functions/go_funcs_S.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import (abs, asarray, cos, floor, arange, pi, prod, roll, sin,
                    sqrt, sum, repeat, atleast_2d, tril)
 from numpy.random import uniform

benchmarks/benchmarks/go_benchmark_functions/go_funcs_T.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, asarray, cos, exp, arange, pi, sin, sum, atleast_2d
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_U.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, sin, cos, pi, sqrt
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_V.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import sum, cos, sin, log
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_W.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import atleast_2d, arange, sum, cos, exp, pi
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_X.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 import numpy as np
 from numpy import abs, sum, sin, cos, pi, exp, arange, prod, sqrt
 from .go_benchmark import Benchmark

benchmarks/benchmarks/go_benchmark_functions/go_funcs_Y.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, sum, cos, pi
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_Z.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 from numpy import abs, sum, sign, arange
 from .go_benchmark import Benchmark
 

benchmarks/benchmarks/go_benchmark_functions/go_funcs_univariate.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
 from numpy import cos, exp, log, pi, sin, sqrt
 
 try:

benchmarks/benchmarks/integrate.py

@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import numpy as np
 from .common import Benchmark
 

benchmarks/benchmarks/interpolate.py

@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import numpy as np
 
 from .common import run_monitored, set_mem_rlimit, Benchmark

benchmarks/benchmarks/io_matlab.py

@@ -1,4 +1,3 @@
-from __future__ import division, absolute_import, print_function
 from .common import set_mem_rlimit, run_monitored, get_mem_info
 
 import os

benchmarks/benchmarks/linalg.py

@@ -1,5 +1,3 @@
-from __future__ import division, absolute_import, print_function
-
 import math
 
 import numpy.linalg as nl

benchmarks/benchmarks/linalg_solve_toeplitz.py

@@ -1,7 +1,5 @@
 """Benchmark the solve_toeplitz solver (Levinson recursion)
 """
-from __future__ import division, absolute_import, print_function
-
 import numpy as np
 
 try:

benchmarks/benchmarks/linalg_sqrtm.py

@@ -1,8 +1,6 @@
 """ Benchmark linalg.sqrtm for various blocksizes.
 
 """
-from __future__ import division, absolute_import, print_function
-
 import numpy as np
 
 try:

benchmarks/benchmarks/linprog_benchmark_files/__init__.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
-
 """
 ==============================================================================
 `` --  Problems for testing linear programming routines

benchmarks/benchmarks/lsq_problems.py

@@ -1,7 +1,5 @@
 """Benchmark problems for nonlinear least squares."""
 
-from __future__ import division
-
 from collections import OrderedDict
 import inspect
 import sys

benchmarks/benchmarks/optimize.py

@@ -1,5 +1,3 @@
-from __future__ import division, print_function, absolute_import
-
 import os
 import time
 import inspect