diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2015-10-21 14:36:29 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2015-10-21 14:36:29 -0600 |
commit | 626eb3748d067ea6e4c4dd308252bfad97df186f (patch) | |
tree | f93b4277b2b3e1b2428dd9674ff8258372748e82 | |
parent | e24895ce5c6568296b375b1fa5b15785f5d475e6 (diff) | |
parent | 922442fe0251df29b3494a2aa93a0d3f18155481 (diff) | |
download | numpy-626eb3748d067ea6e4c4dd308252bfad97df186f.tar.gz |
Merge pull request #6526 from dsanders11/patch-1
Fix use of __doc__ in setup.py for -OO mode
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | setup.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 64ed69aa8..2447360f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,8 @@ matrix: env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1 - python: 2.7 env: USE_WHEEL=1 + - python: 2.7 + env: PYTHONOPTIMIZE=2 before_install: - uname -a - free -m @@ -15,7 +15,7 @@ basic linear algebra and random number generation. """ from __future__ import division, print_function -DOCLINES = __doc__.split("\n") +DOCLINES = (__doc__ or '').split("\n") import os import sys |