Skip to content

Commit 8861379

Browse files
committed
Fix wild import warnings in system tests
1 parent 89f0648 commit 8861379

File tree

53 files changed

+417
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+417
-103
lines changed

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSDarkRunBackgroundCorrection.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@
55
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
66
# SPDX - License - Identifier: GPL - 3.0 +
77
# pylint: disable=no-init,invalid-name,too-many-locals,too-many-branches
8-
from mantid.api import AlgorithmFactory, AlgorithmManager, IEventWorkspace, MatrixWorkspaceProperty, Progress, PythonAlgorithm
9-
from mantid.kernel import CommonBinsValidator, Direction, IntArrayBoundedValidator, IntArrayProperty, Logger
8+
from mantid.api import (
9+
AlgorithmFactory,
10+
AlgorithmManager,
11+
CommonBinsValidator,
12+
IEventWorkspace,
13+
MatrixWorkspaceProperty,
14+
Progress,
15+
PythonAlgorithm,
16+
)
17+
from mantid.kernel import Direction, IntArrayBoundedValidator, IntArrayProperty, Logger
1018
import numpy as np
1119

1220

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SimulatedDensityOfStates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
import scipy.constants
1515

16-
from mantid.api import AlgorithmFactory, Progress, PythonAlgorithm, WorkspaceProperty
17-
from mantid.kernel import logger, Direction, FileAction, FileProperty, StringArrayProperty, StringListValidator
16+
from mantid.api import AlgorithmFactory, FileAction, FileProperty, Progress, PythonAlgorithm, WorkspaceProperty
17+
from mantid.kernel import logger, Direction, StringArrayProperty, StringListValidator
1818
import mantid.simpleapi as s_api
1919

2020

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SofQWMomentsScan.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
IntArrayMandatoryValidator,
1616
IntArrayProperty,
1717
Property,
18-
SofQWMoments,
1918
StringArrayProperty,
2019
StringListValidator,
21-
Rebin,
2220
)
23-
from mantid.simpleapi import Fit, LoadLog
21+
from mantid.simpleapi import Fit, LoadLog, Rebin, SofQWMoments
2422

2523
import os
2624
import numpy as np

Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TimeSlice.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@
88
from mantid.api import mtd, AlgorithmFactory, Progress, PropertyMode, PythonAlgorithm, WorkspaceGroupProperty, WorkspaceProperty
99
from mantid.kernel import (
1010
logger,
11+
Direction,
12+
FloatArrayProperty,
13+
IntArrayProperty,
14+
StringArrayProperty,
15+
)
16+
from mantid.simpleapi import (
1117
CalculateFlatBackground,
1218
CropWorkspace,
1319
DeleteWorkspace,
14-
Direction,
1520
Divide,
1621
GroupWorkspaces,
1722
Integration,
18-
FloatArrayProperty,
19-
IntArrayProperty,
20-
StringArrayProperty,
23+
Load,
2124
Transpose,
2225
)
23-
from mantid.simpleapi import Load
2426

2527
from IndirectCommon import check_hist_zero
2628

Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScaleTest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
66
# SPDX - License - Identifier: GPL - 3.0 +
77
import unittest
8-
from mantid.api import AlgorithmManager
8+
from mantid.api import AlgorithmManager, FrameworkManager
99
import numpy as np
1010
from SANSFitShiftScale import ErrorTransferFromModelToData
1111

@@ -293,4 +293,5 @@ def test_that_error_is_transferred(self):
293293

294294

295295
if __name__ == "__main__":
296+
FrameworkManager.Instance()
296297
unittest.main()

Framework/PythonInterface/test/python/plugins/algorithms/WorkflowAlgorithms/SANSStitchTest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
66
# SPDX - License - Identifier: GPL - 3.0 +
77
import unittest
8-
from mantid.api import AlgorithmManager, MatrixWorkspace
8+
from mantid.api import AlgorithmManager, FrameworkManager, MatrixWorkspace
99
import numpy as np
1010

1111
from SANSStitch import QErrorCorrectionForMergedWorkspaces
@@ -890,4 +890,5 @@ def test_correct_x_error_is_produced(self):
890890

891891

892892
if __name__ == "__main__":
893+
FrameworkManager.Instance()
893894
unittest.main()

Testing/SystemTests/tests/framework/ARCSReductionTest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
import os
1313
import systemtesting
14-
from mantid.simpleapi import *
14+
from mantid.api import mtd
15+
from mantid.kernel import config
16+
from mantid.simpleapi import DeleteWorkspace, DgsReduction, ExtractMask, Load, LoadNXSPE, SaveNXSPE
1517

1618

1719
class ARCSReductionTest(systemtesting.MantidSystemTest):

Testing/SystemTests/tests/framework/AlignAndFocusPowderFromFilesTest.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,27 @@
66
# SPDX - License - Identifier: GPL - 3.0 +
77
# pylint: disable=no-init,invalid-name,attribute-defined-outside-init
88
import systemtesting
9-
from mantid.simpleapi import *
10-
from mantid.api import WorkspaceFactory
9+
from mantid.api import mtd, AnalysisDataService, WorkspaceFactory
10+
from mantid.kernel import PropertyManagerDataService
11+
from mantid.simpleapi import (
12+
AlignAndFocusPowder,
13+
AlignAndFocusPowderFromFiles,
14+
ConvertUnits,
15+
CreateGroupingWorkspace,
16+
CylinderAbsorption,
17+
DeleteWorkspace,
18+
Divide,
19+
FilterBadPulses,
20+
LoadDiffCal,
21+
LoadEventAndCompress,
22+
LoadEventNexus,
23+
NormaliseByCurrent,
24+
PDDetermineCharacterizations,
25+
PDLoadCharacterizations,
26+
RebinRagged,
27+
SetSample,
28+
SortEvents,
29+
)
1130
import numpy as np
1231
import os
1332
import time
@@ -418,7 +437,7 @@ def runTest(self):
418437
for i in range(absorptionWS.getNumberHistograms()):
419438
absorptionWS.setX(i, xaxis)
420439
absorptionWS.getAxis(0).setUnit("Wavelength")
421-
mantid.api.AnalysisDataService.addOrReplace("V_abs", absorptionWS)
440+
AnalysisDataService.addOrReplace("V_abs", absorptionWS)
422441
SetSample(
423442
InputWorkspace="V_abs",
424443
Material={"ChemicalFormula": "V", "SampleNumberDensity": 0.0721},

Testing/SystemTests/tests/framework/BuildSQWTest.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,19 @@
1616

1717
import systemtesting
1818
import os
19-
from mantid.simpleapi import *
19+
from mantid.kernel import config, logger
20+
from mantid.simpleapi import (
21+
CompareMDWorkspaces,
22+
ConvertToMD,
23+
DeleteWorkspace,
24+
LoadMD,
25+
LoadNXSPE,
26+
LoadSQW,
27+
MergeMDFiles,
28+
SaveMD,
29+
SetGoniometer,
30+
SetUB,
31+
)
2032

2133
# allow for multiple locations
2234
FILE_LOCATIONS = ["/isis/mantid/localtestdata/"] # ,"d:/Data/MantidSystemTests/BigData/Dropbox/LoadSQW"]
@@ -109,7 +121,7 @@ def cleanup(self):
109121
try:
110122
os.remove(filename)
111123
except OSError:
112-
mantid.logger.warning("Unable to remove created file '%s'" % filename)
124+
logger.warning("Unable to remove created file '%s'" % filename)
113125

114126

115127
class LoadSQW_FileBasedTest(BuildSQWTest):

Testing/SystemTests/tests/framework/CNCSReductionTest.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
import os
1313
import systemtesting
14-
from mantid.simpleapi import *
14+
from mantid.api import mtd
15+
from mantid.kernel import config
16+
from mantid.simpleapi import CNCSSuggestTIB, DeleteWorkspace, DgsReduction, GenerateGroupingPowder, Load, LoadNXSPE, SaveNXSPE
1517

1618

1719
class CNCSReductionTest(systemtesting.MantidSystemTest):

0 commit comments

Comments
 (0)