Merge pull request #8488 from anntzer/one-fewer-travis-job

QuLogic · web-flow · commit d1947cedb0e2 · 2017-04-17T02:27:19.000-04:00
Build docs with oldest numpy on 2.7.
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
     - python: 2.7
       env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas NOSE=nose
     - python: 2.7
-      env: BUILD_DOCS=true
+      env: NUMPY=numpy==1.7.1 BUILD_DOCS=true
     - python: 3.4
       env: PYTHON_ARGS=-OO
     - python: 3.5
diff --git a/examples/misc/rec_join_demo.py b/examples/misc/rec_join_demo.py
diff --git a/examples/showcase/mandelbrot.py b/examples/showcase/mandelbrot.py
@@ -14,11 +14,11 @@
 
 
 def mandelbrot_set(xmin, xmax, ymin, ymax, xn, yn, maxiter, horizon=2.0):
-    X = np.linspace(xmin, xmax, xn, dtype=np.float32)
-    Y = np.linspace(ymin, ymax, yn, dtype=np.float32)
-    C = X + Y[:, None]*1j
-    N = np.zeros(C.shape, dtype=int)
-    Z = np.zeros(C.shape, np.complex64)
+    X = np.linspace(xmin, xmax, xn).astype(np.float32)
+    Y = np.linspace(ymin, ymax, yn).astype(np.float32)
+    C = X + Y[:, None] * 1j
+    N = np.zeros_like(C, dtype=int)
+    Z = np.zeros_like(C)
     for n in range(maxiter):
         I = np.less(abs(Z), horizon)
         N[I] = n
