diff options
Diffstat (limited to 'silx/math')
| -rw-r--r-- | silx/math/fit/fitmanager.py | 12 | ||||
| -rw-r--r-- | silx/math/fit/test/test_fit.py | 6 | ||||
| -rw-r--r-- | silx/math/medianfilter/test/test_medianfilter.py | 4 | ||||
| -rw-r--r-- | silx/math/test/benchmark_combo.py | 5 | ||||
| -rw-r--r-- | silx/math/test/test_combo.py | 4 | ||||
| -rw-r--r-- | silx/math/test/test_marchingcubes.py | 4 |
6 files changed, 18 insertions, 17 deletions
diff --git a/silx/math/fit/fitmanager.py b/silx/math/fit/fitmanager.py index 4a12a24..f62dedb 100644 --- a/silx/math/fit/fitmanager.py +++ b/silx/math/fit/fitmanager.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*######################################################################### # -# Copyright (c) 2004-2017 European Synchrotron Radiation Facility +# Copyright (c) 2004-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -240,15 +240,15 @@ class FitManager(object): If this parameter is provided, all other parameters, except for ``name``, are ignored. :type theory: :class:`silx.math.fit.fittheory.FitTheory` - :param function function: Mandatory argument if ``theory`` is not provided. + :param callable function: Mandatory argument if ``theory`` is not provided. See documentation for :attr:`silx.math.fit.fittheory.FitTheory.function`. - :param list[str] parameters: Mandatory argument if ``theory`` is not provided. + :param List[str] parameters: Mandatory argument if ``theory`` is not provided. See documentation for :attr:`silx.math.fit.fittheory.FitTheory.parameters`. - :param function estimate: See documentation for + :param callable estimate: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.estimate` - :param function configure: See documentation for + :param callable configure: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.configure` - :param function derivative: See documentation for + :param callable derivative: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.derivative` :param str description: See documentation for :attr:`silx.math.fit.fittheory.FitTheory.description` diff --git a/silx/math/fit/test/test_fit.py b/silx/math/fit/test/test_fit.py index 11b53cd..372d6cb 100644 --- a/silx/math/fit/test/test_fit.py +++ b/silx/math/fit/test/test_fit.py @@ -30,7 +30,7 @@ import unittest import numpy import sys -from silx.test import utils +from silx.utils import testutils from silx.math.fit.leastsq import _logger as fitlogger @@ -241,7 +241,7 @@ class Test_leastsq(unittest.TestCase): fittedpar[i]) self.assertTrue(test_condition, msg) - @utils.test_logging(fitlogger.name, warning=2) + @testutils.test_logging(fitlogger.name, warning=2) def testBadlyShapedData(self): parameters_actual = [10.5, 2, 1000.0, 20., 15] x = numpy.arange(10000.).reshape(1000, 10) @@ -263,7 +263,7 @@ class Test_leastsq(unittest.TestCase): fittedpar[i]) self.assertTrue(test_condition, msg) - @utils.test_logging(fitlogger.name, warning=3) + @testutils.test_logging(fitlogger.name, warning=3) def testDataWithNaN(self): parameters_actual = [10.5, 2, 1000.0, 20., 15] x = numpy.arange(10000.).reshape(1000, 10) diff --git a/silx/math/medianfilter/test/test_medianfilter.py b/silx/math/medianfilter/test/test_medianfilter.py index a4c55b2..1171e23 100644 --- a/silx/math/medianfilter/test/test_medianfilter.py +++ b/silx/math/medianfilter/test/test_medianfilter.py @@ -25,14 +25,14 @@ __authors__ = ["H. Payno"] __license__ = "MIT" -__date__ = "02/05/2017" +__date__ = "17/01/2018" import unittest import numpy from silx.math.medianfilter import medfilt2d from silx.math.medianfilter.medianfilter import reflect, mirror from silx.math.medianfilter.medianfilter import MODES as silx_mf_modes -from silx.test.utils import ParametricTestCase +from silx.utils.testutils import ParametricTestCase try: import scipy import scipy.misc diff --git a/silx/math/test/benchmark_combo.py b/silx/math/test/benchmark_combo.py index ad5ae41..e179f76 100644 --- a/silx/math/test/benchmark_combo.py +++ b/silx/math/test/benchmark_combo.py @@ -27,7 +27,7 @@ from __future__ import division __authors__ = ["T. Vincent"] __license__ = "MIT" -__date__ = "15/05/2017" +__date__ = "17/01/2018" import logging @@ -37,7 +37,8 @@ import unittest import numpy -from silx.test.utils import ParametricTestCase, temp_dir +from silx.test.utils import temp_dir +from silx.utils.testutils import ParametricTestCase from silx.math import combo diff --git a/silx/math/test/test_combo.py b/silx/math/test/test_combo.py index 7698e78..2e142f3 100644 --- a/silx/math/test/test_combo.py +++ b/silx/math/test/test_combo.py @@ -27,14 +27,14 @@ from __future__ import division __authors__ = ["T. Vincent"] __license__ = "MIT" -__date__ = "19/10/2017" +__date__ = "17/01/2018" import unittest import numpy -from silx.test.utils import ParametricTestCase +from silx.utils.testutils import ParametricTestCase from silx.math.combo import min_max diff --git a/silx/math/test/test_marchingcubes.py b/silx/math/test/test_marchingcubes.py index d6aa8e9..41f7e30 100644 --- a/silx/math/test/test_marchingcubes.py +++ b/silx/math/test/test_marchingcubes.py @@ -27,13 +27,13 @@ from __future__ import division __authors__ = ["T. Vincent"] __license__ = "MIT" -__date__ = "05/12/2016" +__date__ = "17/01/2018" import unittest import numpy -from silx.test.utils import ParametricTestCase +from silx.utils.testutils import ParametricTestCase from silx.math import marchingcubes |