Commit 4e16602f authored by Conor Finn's avatar Conor Finn
Browse files

RE #27722 Remove other python version checks

parent c69aa1d1
......@@ -10,8 +10,6 @@ import math
import numpy as np
import scipy as sc
from sys import version_info
from mantid.simpleapi import *
from mantid.kernel import *
from mantid.api import *
......@@ -48,8 +46,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
doc='Output Workspace of remapped simulation data')
def PyExec(self):
self.validate_environment()
e_fixed = float(self.getPropertyValue('EFixed'))
# Loads simulated workspace
simulation = self.getPropertyValue('InputWorkspace')
......@@ -80,14 +76,6 @@ class NMoldyn4Interpolation(PythonAlgorithm):
VerticalAxisValues=ref_Q, WorkspaceTitle=output_ws)
self.setProperty('OutputWorkspace', output_ws)
def validate_environment(self):
# RHEL 6 produces spurious results because it runs on Python 2.6.X
# test and warn for this. When RHEL6 is no longer supported this check
# can be removed
python_version = version_info
if python_version < (2, 7, 0):
logger.warning("NMoldyn4Interpolation may not run correctly on Python 2.6 and below")
def validate_bounds(self, sim_X, ref_X, sim_Q, ref_Q):
if min(sim_X) > min(ref_X):
raise ValueError('Minimum simulated X value is higher than minimum '
......
......@@ -110,9 +110,4 @@ class NMoldyn4InterpolationTest(unittest.TestCase):
if __name__ == "__main__":
python_version = version_info
if python_version < (2, 7, 0):
logger.warning("Not running this test as it requires Python >= 2.7. Version found: {0}".
format(python_version))
else:
unittest.main()
unittest.main()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment