Skip to content
Snippets Groups Projects
Unverified Commit 4ac26642 authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #21615 from rosswhitfield/np1.4

Change to try/except instead of checking version for numpy >= 1.14 doctests
parents ef60bb9e 2929772f
No related branches found
No related tags found
No related merge requests found
...@@ -103,8 +103,10 @@ except NameError: ...@@ -103,8 +103,10 @@ except NameError:
# TODO: remove this workaround once minimal required numpy is set to 1.14.0 # TODO: remove this workaround once minimal required numpy is set to 1.14.0
import numpy as np import numpy as np
if np.version.full_version >= '1.14.0': try:
np.set_printoptions(legacy='1.13') np.set_printoptions(legacy='1.13')
except TypeError:
pass
""".format(mantid_config_reset) """.format(mantid_config_reset)
# Run this after each test group has executed # Run this after each test group has executed
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment