From c9509db3bc521cb6a8208e59cbfbaf8ebe4a0aba Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Tue, 9 Jan 2018 16:34:48 -0500
Subject: [PATCH] Re #21385. Fix compatibility with older numpy/matplotlib
---
Framework/PythonInterface/mantid/plots/functions.py | 4 ++--
.../test/python/mantid/plots/plots__init__Test.py | 2 +-
Testing/Temporary/CTestCostData.txt | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
delete mode 100644 Testing/Temporary/CTestCostData.txt
diff --git a/Framework/PythonInterface/mantid/plots/functions.py b/Framework/PythonInterface/mantid/plots/functions.py
index b6003efb8ec..2f537a5c4ef 100644
--- a/Framework/PythonInterface/mantid/plots/functions.py
+++ b/Framework/PythonInterface/mantid/plots/functions.py
@@ -183,7 +183,7 @@ def _getMatrix2DData(workspace, distribution,histogram2D=False):
else:
if histogram2D:
if _commonX(x):
- x=numpy.broadcast_to(numpy.expand_dims(boundaries_from_points(x[0]),0),(z.shape[0]+1,z.shape[1]+1))
+ x=numpy.tile(boundaries_from_points(x[0]),z.shape[0]+1).reshape(z.shape[0]+1,-1)
else:
x = numpy.vstack((x,x[-1]))
x = numpy.array([boundaries_from_points(xi) for xi in x])
@@ -192,7 +192,7 @@ def _getMatrix2DData(workspace, distribution,histogram2D=False):
else:
if len(y)==z.shape[0]+1:
y=points_from_boundaries(y)
- y = numpy.broadcast_to(numpy.expand_dims(y,1),x.shape)
+ y = numpy.tile(y,x.shape[1]).reshape(x.shape[1],x.shape[0]).transpose()
return (x,y,z)
diff --git a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
index 47b85ea6e70..6f2f7261f00 100644
--- a/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
+++ b/Framework/PythonInterface/test/python/mantid/plots/plots__init__Test.py
@@ -33,7 +33,7 @@ class Plots__init__Test(unittest.TestCase):
def test_fail(self):
fig, ax = plt.subplots()
- self.assertRaises(AttributeError,ax.plot,self.ws2d_histo,'rs',specNum=1)
+ self.assertRaises(Exception,ax.plot,self.ws2d_histo,'rs',specNum=1)
self.assertRaises(ValueError,ax.pcolormesh,self.ws2d_histo)
if __name__ == '__main__':
diff --git a/Testing/Temporary/CTestCostData.txt b/Testing/Temporary/CTestCostData.txt
deleted file mode 100644
index ed97d539c09..00000000000
--- a/Testing/Temporary/CTestCostData.txt
+++ /dev/null
@@ -1 +0,0 @@
----
--
GitLab